Michael,

To save time, I just fixed the conflicts. If you 'pull' again from master v2, you should get up-to-date.

I'm going to do the switch back from v2 to master tonight (in a few hours time). I'll let you know when done.

Regards, Mark.

On 20 Dec, 2012, at 9:29 AM, Mark Webb-Johnson wrote:

I think our revisions overlapped. I'd just merged in all your previous changes, plus documentation and server code updates.

I did make some minor layout fixes (where the indentation was wrong - I think you are using 4 spaces, or perhaps tabs, where the rest of the project uses 2). I also added your pseudo-command #6 to the protocol document.

Can you merge in my changes, then re-push yours? I'd like to get this v2 branch complete today and merge back into master tonight (my time).