Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:50:47 +0000 (21:50 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:50:47 +0000 (21:50 +0200)
commitd4a0e849b9f1534520af99093f0dd05254857e77
treef67ffa33d28ebb13b1e76361c1372475d696b623
parentda7707ca57ac231a01b8fcab83298b8e2d21988c
parentdd53060d7628d34d16d99ba7cca5d864cb5dec57
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I64a312169c1234a0a26a582bde2c08bb7e9c718e