Merge branch 'stable' into dev dev_1378902914 dev_1378920809 dev_1378966022 91/65191/1
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 11 Sep 2013 11:31:09 +0000 (13:31 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 11 Sep 2013 11:31:41 +0000 (13:31 +0200)
commit4072c25a70acaa11e7831848c327be7886ef473e
tree5e586534916bc8a74dc51439c8601940f288606f
parentea9702923e86fc3decadbc831e31b349bd40ac44
parent770893c71b179aa87c1bf2d83318ba62c8c2aa96
Merge branch 'stable' into dev

Conflicts:
qt.pro

Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82
init-repository
qt.pro