Melanie bf630fb808 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs		2012-05-02 01:37:51 +01:00
..
Interfaces	Merge branch 'master' into careminster	2012-05-02 01:37:51 +01:00
Scenes	Merge branch 'master' into careminster	2012-05-02 01:37:51 +01:00
ModuleLoader.cs	Merge branch 'master' into careminster-presence-refactor	2011-04-12 00:27:39 +01:00