Merge remote-tracking branch 'origin/release' into stable v5.2.1
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 3 Dec 2013 17:27:21 +0000 (18:27 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 3 Dec 2013 17:27:21 +0000 (18:27 +0100)
commita4476cc12ee46be6cbb417bda7cf86743aca3064
tree62e426ffee1f12d8004a0bc1332800b555c93600
parent190fd107ebf489783d9b673b97598da8febd48cc
parent2866c00375313d1726cc0473b6b7bfc87b984c78
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Id938fd62f7a500973b43f21e803f8b8c0c1a660d