Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 27 Jun 2013 11:00:02 +0000 (13:00 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 27 Jun 2013 11:00:02 +0000 (13:00 +0200)
commit0a3f1aacd38cc447bc85032a4ae2509ae472af94
tree3e0e9278ffa54a06720cf52fcf6f1bdca2a4d46a
parent6d40540fceb0aaaeb41c5f686b905277501446a3
parent18a8381ab324fce9ed162b63e185eaf541c2c92b
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I48a140d1bbe82ab65e54683d77aea8c97c06ec80