Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:52:48 +0000 (21:52 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:52:48 +0000 (21:52 +0200)
commitd6b4d9ad75b06b16d7555ebeace6f06010379cf5
treeac7c26e3c44e7d1e251da8becca7c9fe20d9c0dc
parentda20d0d1fe5bc692915dc600522686dc58d9e4df
parent3f3a2bbf41c68b5ab6596f785ca949f143126bc2
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I861d55430174471036b7e7e34202725ae6131490