Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:46:03 +0000 (18:46 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:46:03 +0000 (18:46 +0100)
commita48df54486c6f22e99e13bec34533a9e97f4a404
treedeff7f0d04e85b507e3f4010ff44528ff801a80a
parent7e9b0f8e55cbdfc780a28b054ac2ad66a630e312
parenta4476cc12ee46be6cbb417bda7cf86743aca3064
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ib5b91e20ee9aff1fb0eba6854fa517961f8fce5b