Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:05:06 +0000 (16:05 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:05:06 +0000 (16:05 +0100)
commit7e9b0f8e55cbdfc780a28b054ac2ad66a630e312
tree2cbf9d330d7d86df65205aa48fbac9dcd62c5383
parent2b5ea944b1d2f717dd74f6524cd0adc9077425de
parent190fd107ebf489783d9b673b97598da8febd48cc
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: Ia89f74de1281f7357cfa75b22b6d43e83b032ab2