Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 31 May 2013 11:48:10 +0000 (13:48 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 31 May 2013 11:48:10 +0000 (13:48 +0200)
commit6f2625e0e0e2818af6fdeb69528ada18556daef2
tree4c4fe8c355c57c579d8ab5816c027a3ccd59360a
parentfb6c137d548bf0752d9e3740f96e6fa61addf3c0
parent7d469e82e274d334c7d03d81b10d225c59d30798
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ic0daef1ae2cd8d9dc9e4e1597d730a42ad00c7b1