Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:19:21 +0000 (19:19 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:19:21 +0000 (19:19 +0200)
commitecf4a2fae523163ae0b444a3b7ca081d03fa5a76
tree19ba61e1504a0f3f809a785205c237296835d9b6
parenta5ca4a64ac54a2bc67421a74d2caf5f085d26861
parent1ce9af6c1c32b20dedc33bd46cde5ee4b34a04c1
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Idc73ff997eb15638c2f9e142e1a09096687a410a