Merge remote-tracking branch 'origin/release' into stable old/5.1
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:37:36 +0000 (21:37 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:37:36 +0000 (21:37 +0200)
commit356b272b7afe4512becadf1bcefbcae9366fb00b
treee63e7075956ff09ab31435f5af907a238b9a009f
parent281a75269f753fbf88ead18b24c7590070c82588
parent8c71c115808cf08a135ab4a8186c3a215477559a
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ie8125e55d25a0a3d1ada3641398c31993a573107