Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 16 Aug 2013 18:53:47 +0000 (20:53 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 16 Aug 2013 18:53:47 +0000 (20:53 +0200)
commit188b59609b1c01792b63e02e8c230616b93f5c51
tree68ee0d8ef4296f8e936d17e75ceabdb4227e80dc
parent291f1229feff087ac9a850ec7a92152f1b69af58
parentdf4336a84426c84e692df86172cc0bf381261830
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ibcde5cfcb97948f9e3f71a2d6b06397e1003aa3b