Merge branch 'master' into stable
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 3 Dec 2012 20:57:28 +0000 (21:57 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 3 Dec 2012 20:58:14 +0000 (21:58 +0100)
commit23153fb8c5934ae22009f43efe90e06eebc977c0
tree546a0ac338c0770b709ebd08219443fabf5b9e83
parent16aef5baa8ffeb8ad1c26727a12773ed2940e0de
parent9e9b98aeea11e75db5a93299d70439370398b553
Merge branch 'master' into stable

Change-Id: I5c0c9a131cca64fea3bc784339d14d84076edc1a