It's been a while since you have merged trunk - please use bzr merge after implementing the in-line comments.
« Back to merge proposal
It's been a while since you have merged trunk - please use bzr merge after implementing the in-line comments.