Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor ...

This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.

2010-01-16 00:05:08 +00:00

..

HttpServerBase.cs

Add the console port setting to ROBUST, too

2010-01-11 03:49:05 +00:00

ProtocolVersions.cs

Formatting cleanup.

2009-10-01 09:38:36 +09:00

ServerUtils.cs

Several more buglets removed.

2010-01-13 09:17:30 -08:00

ServicesServerBase.cs

Add "shutdown" command to ROBUST shell

2009-11-30 14:15:00 +00:00