Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Feb 2014 13:11:15 +0000 (14:11 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Feb 2014 13:11:15 +0000 (14:11 +0100)
commit41e685d02ff7c881b90970f6fd8b6c7a2a2831c7
treef4a3048c58be17b546f620ac22a1cdcd5035490e
parent70a8761f6c059d18169b6565886dc9159dabebd3
parentb21d397336d52d034ab6db699c26bf3918fe81e6
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5eed3f81fe220f82d1eba27d7e7a62803fea5e49