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)
Change-Id: I939d6b9d10b3f50d9024b80d7a215b8fd04e8d56


Trivial merge