* John Rouillard <issues@roundup-tracker.org> [20130424 05:18]:
> I just pushed the changes to the master repo. I am not quite sure
> I did it right as I had already committed my changes before I
> realized there were updates in the master repo. So I did a:
> 
>   hg pull
>   hg merge
>   hg ci
>   hg push
> 
> to get my changes mixed into the current master code.
> But at least the changes are in the master repo for your
> enjoyment.

This is the correct action and your merge looks fine.

Thanks for this feature, I think this will allow me to fix a problem
I have in a customized setup.

Regards,
Thomas