Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Oct 2013 14:17:00 +0000 (16:17 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Oct 2013 14:17:00 +0000 (16:17 +0200)
commit6d1e5b38dd64143e391203f966208a207dba099f
treec1e09e090bfb25d71a073fb198607e38e4d57df1
parent9c1470888d8fa1dc3220ea411b8429bf8e9df688
parent1fd8af1c9e6bca1180f2193aa26d1d01df817395
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Icd0bc0b31f6c925850d6773ec1000afc9a702d36