Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:46:10 +0000 (18:46 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:46:10 +0000 (18:46 +0100)
commitbe0a6f788ec35c28abbee3f3f910d4a1cce46aca
treee02373373402a975cf661075610ed3032b2cb968
parent871addbdcb8e346efb86268443b99ec7d03fedf5
parenta2da34be8426b41047f895a3e8463d58baf3b576
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I6498ca9158162e2c2b9db6867128ba4ae687f5f9