Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 14 May 2014 10:40:46 +0000 (12:40 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 14 May 2014 10:40:46 +0000 (12:40 +0200)
commitb474a43e9b87f6e34f54cee5e4ac6842cc182fff
tree387cc91f9d0c2d4bbeb70683071c006815f3bdfb
parent8b9836d0e00736b5a16f650667218612940e106b
parent6419556a2bebe81244198e84696aa6eeebdf463d
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I9de811ee1f43381b6ce27acd47a126a70fd10d46