Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:52:39 +0000 (21:52 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:52:39 +0000 (21:52 +0200)
commit74df40dc55a9f21dff726e03d4926ab6a953d002
tree90b389b907a6f2bb45d8e79c3ba92e9186ebedf8
parentd878e1cc5640b2f9d207f42490ea9f9366ef7125
parent963048b982d823e44e785b765b70249720acd252
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I5d24c988e8c7d767e18e54344f001d1145e99a5b