Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 14 May 2014 10:39:55 +0000 (12:39 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 14 May 2014 10:39:56 +0000 (12:39 +0200)
commit25596443e11aa9fdfe124fe390a44474dfb715c7
treeb5daff646ecd9c7e042409c5871ca800569b2950
parent4603bf1bdcf20307398838e9435d18f1a4442983
parent73c42e6ef76301c18a36bc0265773f84c9d375ba
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I05aa3988ce01f01bf987e259dcac0144e52cdf89