Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Sat, 28 Sep 2013 22:08:37 +0000 (00:08 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Sat, 28 Sep 2013 22:08:37 +0000 (00:08 +0200)
commited1cbb04b964240f7e3a6777f7de7e1fab813099
tree77679c2abf14cd8dc4ff22bccd88326c131406b7
parent9ac19b2bb9c3caa6495fd68acc7dead732e04e41
parent342831427beb0f3a48061453df89624ba2d7c886
Merge branch 'stable' into dev

Change-Id: I2799f7a11d9fb86db03536f78b4ba1b673877207