Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:47:21 +0000 (10:47 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:47:21 +0000 (10:47 +0200)
commit66752cfe6e1d1579393a3241dca33dd9264a95ef
treeb73a17269a8aafdef8ff45e34ef9add9200f432a
parentd11e6eba4c41bdefdf632caa313e5c68d97d6c9c
parent356b272b7afe4512becadf1bcefbcae9366fb00b
Merge branch 'stable' into dev

Conflicts:
.qmake.conf

Change-Id: I71fe9944c94bac1b7438a641ad9fdaf670103f2c