Merge remote-tracking branch 'origin/release' into stable
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 18 Mar 2013 13:05:57 +0000 (14:05 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 18 Mar 2013 13:06:12 +0000 (14:06 +0100)
commit8d2d75d51bc62214936be5a1078677e3c291c550
tree43ba091b50f39d15c4b8bc57f59c7c541aab1fe6
parent3864fb8cd69773adaec9b9364ac7ad85a439407b
parent3928bb7da27de9ec958288b24239e6cc6eb44576
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I3a54f62113889ea6ffad1265900ce28dd4f78d28