Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:24:56 +0000 (17:24 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:24:56 +0000 (17:24 +0100)
commit42c568edebcee89dcf14a87c559bc142d7064ff0
treef15ad373e386a1d8bd25c67a93c82fe49578ccd2
parent2e049836ee16f4aedbe7ccc3335fc57852725716
parentf89d64ca722acf4a1a38c5e136bb01eff2525978
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I312f9535c2b4937f0575dec6491f0d73f2726b28