Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:40:18 +0000 (10:40 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:40:18 +0000 (10:40 +0200)
commitac8ff6bca583f73efcf172d89534e95769618abc
treed8af4bec1ba44702c19b07effeb25dbe90af09a6
parentf4f7da2d9fd4c197c35e0d3e3820d99e73336a45
parent9e21979e13304b858301a62d227b7a801b949761
Merge branch 'stable' into dev

Conflicts:
.qmake.conf

Change-Id: I41d9d4027204c02ea486c7665294c2024d3a3aeb