Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 27 Jun 2013 11:00:59 +0000 (13:00 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 27 Jun 2013 11:00:59 +0000 (13:00 +0200)
commit7adb3cb437bf8e4874c9d58de3a29a7e3d75166f
tree5e13792c39a4144d4e19436bc3f9cb22fc6a3993
parentbcd22251f27bb729bda47744039e24c54e3be6d5
parentd251ee9dcbd015f2acbe76231902b72163cd05a2
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I8ced3d911cec321949dd8b160447792ef9bbd3c3