Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:40:01 +0000 (10:40 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:40:01 +0000 (10:40 +0200)
commitab19bcfffc5b5074f9ff68903abeac1c14b576ac
treeaad9a01e855666dc05d09b8aa435d58ff52877a7
parent20412631b3363866b764368cfd715dec6f148412
parentc82bd369121a89fa999f41362ec904f00461b997
Merge branch 'stable' into dev

Conflicts:
.qmake.conf

Change-Id: Ib841f2c7f6c0819ff9b41a11249331ca585d6d60