Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:16:44 +0000 (18:16 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:16:44 +0000 (18:16 +0100)
commit2733c790d368c0c53e1471f6a60dbed25e797b5b
treeec820b2a440801eb098234b488fb0673f563b7c8
parentd099a75653713e79318d538ef32d49f989d5e74c
parent960afee2cf5041d873f596e91eeafb42d3144e98
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I6556b93b0897a2df48a68238b8ab150541fcbb3f