Merge remote-tracking branch 'origin/release' into stable old/5.1
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:50:25 +0000 (21:50 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:50:25 +0000 (21:50 +0200)
commit9e21979e13304b858301a62d227b7a801b949761
treeac0de7572e8f7dab1da3406eb67ac43c43b4a3e1
parentfb048ecc788e1daae5b9c3bf57ab15c306d6b397
parent520dcd65b5dce886c5f458deb60dde157c5dd884
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I663dcb98573fa55d69b73f3740aa54772c55ff14