Files
opensim/OpenSim/Region/CoreModules/Avatar
Melanie 1f32730798 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-03-03 09:58:57 +00:00
..
2011-11-04 01:18:37 +00:00
2011-01-18 01:48:37 +00:00
2011-12-05 21:26:43 +01:00
2012-01-17 17:36:26 +01:00