Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:28:48 +0000 (23:28 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:28:48 +0000 (23:28 +0200)
commit82c37e5a5d4b01132a521bcbb8f14a9031575303
tree839816e51b7c23ba9281decfb0fda06c54991a89
parentb18076a1a85b31ade80288633c9c753a445e2780
parent2d3774e819a65616c06d79a20fc6451b4d93ecf0
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ibc00a0629361eb26d2ad3b47e64620a2ad03717b