Files
opensim/OpenSim/Region/CoreModules/ServiceConnectorsOut
Melanie db774d4292 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
..
2012-08-16 15:26:16 +01:00