Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:11:52 +0000 (13:11 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:11:52 +0000 (13:11 +0200)
commite44e545ccfc6e6ed2847497bc09c6497e364cc98
treebb498041ae2b96e7d74e475aa7b55daabed4e813
parent8ccafa889c968112b197894c29956716aebcfc15
parent6341e5333a40f293db873400942db7b0ea3629e8
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I1609a9761c9942f3f702c6cb963d338674344ca5