Merge remote-tracking branch 'origin/release' into stable old/5.2
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 17:57:53 +0000 (18:57 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 17:57:53 +0000 (18:57 +0100)
commitb21d397336d52d034ab6db699c26bf3918fe81e6
treeb25b383c5721ec006594b5559b31585fd93f64cd
parent189bb9912851fe4eaafec6393d598cfaeed5b42e
parentd6d1217473882c82eca37341d837c195e991058a
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Icbc8dda64ebc3591a1cf8751ce513ab843d5233f