Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 29 Apr 2013 12:19:29 +0000 (14:19 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 29 Apr 2013 12:19:29 +0000 (14:19 +0200)
commitcb324a50c920b275ef6c04162712b1a6f19bbe8d
treebf2e6f0565599154ad39996bf9f69515a584b1aa
parentf23a7f9da4958527a7fe762f82fa7fc28e8f0adf
parent20fa4834478ec211c3d4fbcd4066f01cc2024285
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I0f0457e9863f540b7bd8bc104c92891d8cf5c483