Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:03:08 +0000 (16:03 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:03:08 +0000 (16:03 +0100)
commit713e1b66e35e08bd05b5ed0684665d068366ff7f
tree32b7e78cf7d18b7ed2396a3c9b82055f97dd389a
parentaf368200c2ea17c64abae30ebcb3b08399b32861
parente8c1b8423a0e2b36adcf4e238a2bbcb90c731d30
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I194516b948b437c85f0c6f93a1b0b339a4a76bb9