Melanie 4a67e8b98f Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs		2012-04-11 23:35:27 +01:00
..
Interfaces	Merge branch 'master' into careminster	2012-04-11 23:35:27 +01:00
Scenes	Merge branch 'master' into careminster	2012-04-09 21:40:03 +01:00
ModuleLoader.cs	Merge branch 'master' into careminster-presence-refactor	2011-04-12 00:27:39 +01:00