Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 12 Dec 2013 17:04:03 +0000 (18:04 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 12 Dec 2013 17:04:04 +0000 (18:04 +0100)
commitf709870f1e4f0041696e32cfd2727a600aad8e75
treea1aefc90ef96923d2800a376e1b983c9a368c00f
parent4f8a92b738e29f93c01d0be70c8e5e7686af94b0
parent4c86230bfe563ef1e3ef493b870203761bc9f32d
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ia8a8683d649f27498c77f5b1932dcf1aef46bb04