Melanie baaf660511 Merge branch 'master' into presence-refactor ...

This was a large, heavily conflicted merge and things MAY have got broken.
Please check!

2010-02-08 15:53:38 +00:00

..

Base

Merge branch 'master' into presence-refactor

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

Handlers

Merge branch 'master' into presence-refactor

2010-02-08 15:53:38 +00:00

ServerMain.cs

Fix a glitch in a ROBUST message

2009-10-23 10:41:05 +01:00