Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:29:07 +0000 (17:29 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:29:07 +0000 (17:29 +0100)
commitf217661e4c0c5c653442da65498c4a235a41b785
tree6b991c536ffe45cdd6b20b3855d273e55011aab3
parentec28b7a1d2e2f0f6eec3a272ff86d1de494b2181
parentecf06489d90385cf2ca67dc5f70529f76421beae
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I8a745d75ab994164aa861f5d5082e493b02eaea4