Melanie 083b28de8c Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

2011-10-30 10:16:25 +00:00

..

EntityTransferModule.cs

Merge branch 'master' into bigmerge

2011-10-30 10:16:25 +00:00

HGEntityTransferModule.cs

Merge branch 'master' into careminster-presence-refactor

2011-06-30 00:26:03 +01:00