Melanie 23d5bafa7f Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs		2012-10-03 00:24:33 +01:00
..
Interfaces	Merge branch 'master' into careminster	2012-10-03 00:24:33 +01:00
Scenes	Merge branch 'master' into careminster	2012-10-03 00:24:33 +01:00
ModuleLoader.cs	Merge branch 'master' into careminster-presence-refactor	2011-04-12 00:27:39 +01:00