Merge remote-tracking branch 'origin/stable' into dev
authorIikka Eklund <iikka.eklund@digia.com>
Tue, 1 Apr 2014 08:47:22 +0000 (11:47 +0300)
committerIikka Eklund <iikka.eklund@digia.com>
Tue, 1 Apr 2014 08:47:22 +0000 (11:47 +0300)
commit33ce85cd45493b1b4d7181bed5af66d081995f47
treef6836d9e0964f233d74d6ed0f117a1d963631c7b
parente53d52d8030a76b2f395e58a5a7d04df715b704c
parentf9d03fc1f5a775c1b57f138f4d2ba5b9cdaf2b97
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I084c5a6e44236c96f926d4d0eca4ea0544f28fa7