Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:14:49 +0000 (13:14 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:14:49 +0000 (13:14 +0200)
commita2db9407b8dd22c1ad3eff4df584f2d984b203d1
treed6ed8f2c6499b2aef8b6b550d6203a38352e94ee
parent8f2ebbfe2c96458f92a4b27403968a90af24aa5b
parent6be17278619e58c3f76c28ed3139e5a3462b840d
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I8c55a2177a3daac033165a7601c574ecfdd4f658