Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:09:14 +0000 (16:09 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:09:14 +0000 (16:09 +0100)
commitd883ed46150cdebef5fe469d7f5c22c7ae94f11b
tree9bbed2bc08d0222ee35d38d9998f6952c7d16b8c
parenta6285b0447553732e25aecfcdfee727291ba2637
parent624e7d7bcdcd1f5e5f73faf07f7c19c6f0e04160
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I0b0d5044d34bc915614253e89fb6029d6bfb75f7