Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-05-22 20:23:25 +01:00
37 changed files with 331 additions and 144 deletions

View File

@@ -29,7 +29,6 @@ using System;
using System.Collections.Generic;
using Nini.Config;
using NUnit.Framework;
using OpenSim.Tests.Common.Setup;
using OpenSim.Tests.Common.Mock;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;