Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:06:30 +0000 (18:06 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:06:30 +0000 (18:06 +0100)
commit91f124cfc23442cc0aca23df9b71f3e561706178
treea12b3e66aa13153d6edbc4f34aa92da9153af271
parentf55b0d1fa661e4abd2b2c5c0ec20925f0855e887
parentcd3e1f5dd257fbe1d1b86d4f72eea01293d31047
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Id54a18b587384a7fc0ee23e1c16a3b929be69cbd