Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 15:50:19 +0000 (17:50 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 15:50:19 +0000 (17:50 +0200)
commitc55fa57b94d57726293c5eaeea1fab0d7594ae38
tree90c87718701037d9e5c0ac65736cd9f794f6a7e4
parent216da4f6afefcc72dc5e18c6afc70619bf71b472
parent35200c5405dd11ac49f0d511065c312389d6c46e
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I72347721eff602d08277d03ceca91b2aef7c72cc