Melanie ce5e900721 Merge branch 'master' into careminster ... Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs		2012-02-04 11:48:20 +00:00
..
LoadRegions	…
RegionModulesController	…
RemoteController	Merge branch 'master' into careminster	2012-02-04 11:48:20 +00:00
Rest	…