I've fixed the conflict in the Changelog. Resubmitting for merging into the trunk.
« Back to merge proposal
I've fixed the conflict in the Changelog. Resubmitting for merging into the trunk.