Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 12 Apr 2013 10:55:44 +0000 (12:55 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 12 Apr 2013 10:55:44 +0000 (12:55 +0200)
commitf23a7f9da4958527a7fe762f82fa7fc28e8f0adf
tree96191ab23df7c92cee585f4fa0938b82d74b2fac
parenta13b4dbb32bf3c022cae7f1e9e3c792a8140543b
parentbf26ab71e0713bbcaa967402992630411086769c
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: If2b8ea3be8fdaee2469c5d1c6b29c19dba1eb192