Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-03-10 07:14:03 +00:00
58 changed files with 1011 additions and 845 deletions

View File

@@ -34,7 +34,6 @@ using System.Text;
using HttpServer;
using HttpServer.FormDecoders;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Framework.Servers.Tests