Merge remote-tracking branch 'origin/5.3.2' into 5.3
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 17 Sep 2014 18:58:33 +0000 (20:58 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 17 Sep 2014 18:58:33 +0000 (20:58 +0200)
commitcd1ded8465f2e5c3da7edf1a38b3b5b3d6a6b1cd
tree7000b74970bc5ed4755c96ce269d85eccd0291da
parentf5f5057937e0a66229368a71a619c45043c04727
parent51d6ae099864a79fc57f750f843f04e428986521
Merge remote-tracking branch 'origin/5.3.2' into 5.3

Change-Id: I75765dd8b4ebe39933da89933df1d61ae209e0cd