Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:52:02 +0000 (21:52 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:52:02 +0000 (21:52 +0200)
commitdd92e3363c5bd14191f66499c5206dd18ce07b71
tree90c504dc8e8b38f11d2e425de43196fb47ee0275
parent8a4f744a7298e9cc286ef7f285d9c46ea5a1d51d
parentd3514897db0902f58fa589f5a1c12745ab26709b
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I025901e52747805c61dc7edd40d5f2d067291bd0