Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:03:41 +0000 (16:03 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:03:41 +0000 (16:03 +0100)
commit1490a408c4a360b92bf993e8a4c56cf96acd6033
treed573b969aef42cadae35d4a8309e0b7d7a5b17a1
parent1dcc307325260b02e46075bf230b3dd12236cc14
parentdf23cbf333978facc53185bbdf58219c74baf394
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I9ca4507914df98793d210d8fc7a466c9a14d5b53