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

Change-Id: Id822cb4487136926c8a3a3f54f6a978e8592c6ac