Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 17:58:30 +0000 (18:58 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 18:00:53 +0000 (19:00 +0100)
commit77b974742faa61e21e6e5c87ebff84e19211bea6
treee22f0b2bde5cdf5bc9e9a5053cb2a885bbfcae11
parent0789c35b26b85597a9fb0e03713839643d2feb41
parent44fd56d22ebc8e49f675e3a05721b04653830775
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I7e74e90225c27cb22e51c488a6a0e563359042fe