Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:17:27 +0000 (19:17 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:17:27 +0000 (19:17 +0200)
commitefd11b1eb5684212a3740a2c8dee0211a8a28144
tree52ed5cd151069460b452b0cf1b5533514a7bb2b6
parentbe71d16be5650e25c208db4d4c7c77f849e25864
parent184fc178f4c753727445694c4830c250f53da588
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Id041591bce92162e8c615034c24c56199064e76d