Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:14:04 +0000 (11:14 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:14:05 +0000 (11:14 +0200)
commitf4f7da2d9fd4c197c35e0d3e3820d99e73336a45
treeaa7e751d76faaa706b60e8e65fc22475cf799f34
parent480e2550d7c3be5aecc1b6acdc32fb7cd80fe801
parent94ba2a255c4ca7f07e024c9dedf5547f371fd3a2
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I90a1f360da098f92db19685a2d6b4caddf6f35e8