Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 30 Sep 2013 21:10:39 +0000 (23:10 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 30 Sep 2013 21:10:39 +0000 (23:10 +0200)
commit1cb060814cee73c7742e099388776cf90230e209
tree536f1487f4e9c6b122a10ea6c1c6bf326d22ba53
parentc879400e3d5a0cde94c44b261111f153f391841b
parentc5262bb93a040bd8519c70a8f9adc08549bb49d4
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I298ab5a4c577868702edb5f7a6b2cd359d315699