Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:29:21 +0000 (16:29 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:29:21 +0000 (16:29 +0200)
commit7a688806f677adb8dbab346943b5e2dc8f24b748
treec7294ec88b924c46377113d2f2e7e5242e203b66
parent1410fda0ffddd7501033fe192e02d87c4c2a858b
parent09fea23419b86fc6e2d2fce9ec2b26e7f346657a
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iaadfcd68fec91611b6341860e41a70b9023719de