Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:20:42 +0000 (17:20 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:20:42 +0000 (17:20 +0100)
commit2f2ba9d199154732d942aa4c18874e40446919d5
treed573b969aef42cadae35d4a8309e0b7d7a5b17a1
parent1490a408c4a360b92bf993e8a4c56cf96acd6033
parent39ccd598cd36b01e3b876f55030c639a9bc39687
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I1559e3cb17dd182f72e40ec75fcb987beb000f74