Files
Dan Lake 1091001cf6 Merge branch 'master' into dev
Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
2011-07-25 16:08:00 -07:00
..