Files
opensim/OpenSim/Data
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-12-05 17:10:51 +00:00
2010-09-12 13:43:49 -04:00
2010-10-04 21:28:17 -04:00