Merge remote-tracking branch 'origin/release' into stable v5.2.1
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:53:38 +0000 (10:53 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:55:02 +0000 (10:55 +0100)
commitdf23cbf333978facc53185bbdf58219c74baf394
treea99d30d396dda32d0e7b5b97e00dab00bc6b82fe
parent4cb4ee5d83dd6b5fde87bc7e910758ad0799b559
parent77067ca74e07c34c8db49bf2c1fecaf96bbdcc02
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Iecbe3b7f6f6d75e615155c4103e0fa269ca6d3d2