Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:34:15 +0000 (10:34 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:34:15 +0000 (10:34 +0200)
commitb365ffa8a9bd7273f9f826087df57e32138b88f5
tree0bd09d25ed23c2baaa4decba4fda39f6eef2761a
parente3b5fcca3826d917076c2d4ab349598dd5799048
parentf9df0b99470f905289126f253ede978b611d6333
Merge branch 'stable' into dev

Conflicts:
.qmake.conf

Change-Id: Ic423a5bbe47dfa2b5d432e1af1032067d68b22e6