Files
opensim/OpenSim/Region/CoreModules/Avatar/Friends
Melanie 31736b1aac Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-11-17 19:04:27 +00:00
..
2011-11-14 20:56:56 +00:00