Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:19:52 +0000 (18:19 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:19:52 +0000 (18:19 +0100)
commitc3618f6cdab6acdf745295d2ffa2755eabef72e7
treef6119294a287787a6a8bcf644f81d4ab723cdc89
parent75d5bdc22e218bcf164c315e4a00bc89561aba81
parent97f266a006d82cc8554915cba6bf767b93d71a06
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ib71b7f22be969dae2e1f4bfc20bc8d5478679e5c