Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:26:50 +0000 (17:26 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:26:50 +0000 (17:26 +0100)
commitf501e47a0f37ffb769e9b52a2c6373003f3fa40a
tree6863e13476b172249764e5b3a74660756e4e7c1a
parent7ebe6263c14ad517c73d0c082fc3e962364b8757
parentae68091e0d6023410bc657cf54e7fa9b6c8bbcc2
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: Id5bef032b66a051e3a6e707abae442ccd2610c84