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

..

LibraryModule.cs

Merge branch 'master' into presence-refactor

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

LocalInventoryService.cs

…