Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:18:03 +0000 (18:18 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:18:04 +0000 (18:18 +0100)
commit9520f82e00f26d7d217f7d2777ba2f3cd958d012
treef892162ab33e9b1b7ffa9819fbec49af86196802
parent9b5cc9e6082366cbe6e76c29d493448ef496b43e
parent78985c5c2c4ec8c7d06bf0c59c5534f968d62f07
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I1f7bde2c0f17d6cdb2914ef2b3aff271ad584321