Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 31 May 2013 11:49:48 +0000 (13:49 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 31 May 2013 11:49:48 +0000 (13:49 +0200)
commitfede66578dbd670068eea21342ccb54669cc91b4
tree0dc1ca5e2b89b77260fd138f513f743993b8b5fa
parentcfca1798a5f89a9837708d3fabfe503e515d12f0
parent92092740ab545b2cd718ef2990687a92c428f44d
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I9c98f8277a31aa84e447262ae6745180880d4d2c