Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:43:28 +0000 (19:43 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:43:28 +0000 (19:43 +0200)
commit7a6bf3ed5c5338dca085c3979edc8ec8f51c7980
tree3ac51f00add44ab871434e6d71eae7771b818181
parent0462193b6fb97fbe7ccde496c33d82d4d5fce8c0
parent7e73dc01f85355e23a4ee07c0b624b253541acdc
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: Ib8b5509c48a686f6e916708d83914e13e4f67e9c