Merge remote-tracking branch 'origin/release' into stable
authorIikka Eklund <iikka.eklund@digia.com>
Tue, 20 May 2014 10:26:14 +0000 (13:26 +0300)
committerIikka Eklund <iikka.eklund@digia.com>
Tue, 20 May 2014 10:26:15 +0000 (13:26 +0300)
commit3ed6361bbaa711c9f3441704659ccb971751b44e
treebe1e4f03b558b08481a333adb048028b2fa4ff42
parent009ad875f89d7d7bc4447e18c2fbbd485a75e0b5
parent073cde9d21f95a896ffff3abfcc9a9da89175e28
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I939d6b9d10b3f50d9024b80d7a215b8fd04e8d56