Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:26:22 +0000 (19:26 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:26:22 +0000 (19:26 +0200)
commitfd0df151ed54ee8b799a2fcf5b4db7a51762714f
treec42ba601ffee8e573c947304a222cb2013f6077c
parent3651d51982b2421c21ae80767057586cb823e2c2
parenta196fc62304ae23e68f60ae85a6106692f419f98
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I70792d10fb83d92b3b60e64b89c4dbf8144ccba5