Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:37 +0000 (12:56 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:37 +0000 (12:56 +0200)
commitd099a75653713e79318d538ef32d49f989d5e74c
tree5d100bcf00ea5205eb5cdf18490052570057416b
parentcfc16c6154e4f71eecd15aeb0cb62d8247aac186
parent52d8b58c05aa234848c94758d6beddc0a793e6b4
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I636400c00ec6470d4dff4844a977ef0f5aa3a53b