Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 25 Feb 2013 11:00:09 +0000 (12:00 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 25 Feb 2013 11:00:09 +0000 (12:00 +0100)
commit80fd52266ffe5c3c0c2e38ba059960f19f50a569
treedf33f10c5780ac189ae79fdfbc1bac69e546e313
parentfb6e49f33fab1046aa234be4994219719a3963a8
parentc26dc07a55f39c6300c096b2f8cb13ee42c05ad5
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2cb815afa62d442419b0ee08088fb5d85907c2f1