Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:27:21 +0000 (23:27 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:27:21 +0000 (23:27 +0200)
commit751cf692dcc5cd915841f1a7833f4848a5ab7c04
treec65440a100d8fc23fb1139ac0a887923f6b7c4fc
parent7e144791ab48329ec7db4a3b6bd9789c9275da77
parenta8e3602554c3225046a831cad7a727a56501439b
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I4231685b78a7886928efe191aa7f09bb8a50e81e