Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 12 Aug 2013 10:47:48 +0000 (12:47 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 12 Aug 2013 10:47:48 +0000 (12:47 +0200)
commit5a55be4101a0250ec9c189cc16d4705d881753a3
tree0add50a98c8dc2c5872a8d937cea89af607ddd66
parentd757c73509ddcbca94c85a26eed0a2cebdc5f9eb
parentdd92e3363c5bd14191f66499c5206dd18ce07b71
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: Ieba84e0e32cc81d328bd5178caecb5005b62ab81