Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:45:33 +0000 (18:45 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:45:33 +0000 (18:45 +0100)
commit75e5708832ce31a7edd4f4c1eb15f5b5f3d72c14
treeb30e335d21ba93b889deaacd9421aa7ccc9ca2a1
parentc5706f05a8315c10398a53ba3b269a2b22d01a7d
parent99bebdbb7dbdde259bc06e86079daebb17482c64
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I9c1abddf20e85cc0f29f2da26c398b7180e4f479