Files
opensim/OpenSim/Data
Melanie afca742392 Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2011-11-14 20:03:47 +00:00
..
2011-11-14 20:03:47 +00:00
2010-09-12 13:43:49 -04:00
2010-10-04 21:28:17 -04:00