Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Oct 2013 14:15:43 +0000 (16:15 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Oct 2013 14:15:43 +0000 (16:15 +0200)
commitcd91a949bb7554595e864215b52c29c1558dc958
tree11141d41db7ada93d72b8b9a717589b45d30cc7d
parentc76e112014b639a226ad8ae132693ce4d0f03136
parent1deb9e76e6f8dd85e974913ac3234f89dd4925c8
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iffa749d9e01fe4fd178a60a3debeae06a7693c4c