Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
authorAlex Blasche <alexander.blasche@digia.com>
Wed, 23 Apr 2014 11:00:07 +0000 (13:00 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 23 Apr 2014 11:42:57 +0000 (13:42 +0200)
commit4b08e5038229d113770e7ca57af73bfed7919480
tree88c6a0e475d009ecd18cf965a44162bafb210ef6
parent273977d00178a70c837da4df1a931377fa9d33d8
parent15f5a8a284e3d69219b267ffd6bec153d60fecac
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable