Merge remote-tracking branch 'origin/release' into stable stable v5.3.1
authorJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 09:47:05 +0000 (12:47 +0300)
committerJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 09:47:06 +0000 (12:47 +0300)
commitbce5056b9e16a943357e362455a46685d3f22093
tree73c4e6413605ede3edb556e929a13cb1cdf9e362
parent184bfa548351bc82a74fc9323988a4a060fba738
parent5f0fbc683bce200b17fea82eb711d8ad4c2f3f23
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ic2230a86eb0dda83681f3d400367564ad7b594ad