Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 12 Mar 2013 10:30:09 +0000 (11:30 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 12 Mar 2013 12:13:14 +0000 (13:13 +0100)
commit4dde2b75a3ff9896b1ffb503a4929c65b273c048
treeb0856dee487e3085bcd4046e8ee7c7ad17f1afb9
parentde349a576481ed05756e90d7022ddf0d1aaf49b7
parent2a4e8b258ed68abc9a7f8d4900cb45d4aba5aebf
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I8554e65aeadcad68decd44163e547a2cd9856871