Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 15:30:18 +0000 (16:30 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 15:30:19 +0000 (16:30 +0100)
commite236de90c27acf7ef3b2d301f2f5cab958d791ef
treec103e7ac4a88338e1a416fa2ffc776db19f3e996
parent8827ca857101c64bd797197876746edd76cb20c8
parent02245571bf13e29512f096d1566d6107d5a229de
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iefedab3cfc470affbd3118a4e9eb3c892945cd2a