Merge remote-tracking branch 'origin/release' into stable v5.3.1
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 1 May 2014 10:42:53 +0000 (12:42 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 1 May 2014 10:43:40 +0000 (12:43 +0200)
commit960276ccce0f74d239525cb465fc6e21dcafccec
tree5f3a2e9d3a84f47dd9b8a708508b8eacd0e41e07
parentc77f7f99ff3948b8d2104634217dd9a4df7d07d8
parent585d3147c9b6f800db5906b4418b3159151a1f35
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I7b83f2a71649fa83d35aad557aebc0468e4a6763