Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:52:43 +0000 (21:52 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:52:43 +0000 (21:52 +0200)
commit8a6466bfbc6a55cd55ee09ca9c0d7650508cab9c
tree9a9af3a874c73850ff8a493bf7661c0162e3d61d
parent89ce243149a36ea42a9b22ee0909bc1f0cc724a2
parente792030339b9db11ba64c8b64d70d4f932de3284
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I4ad3ca66f63476974bdfcadcff373179715a34d2