Files
opensim/OpenSim/Services
Melanie 8fac7c0650 Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge
Conflicts:
	OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
2011-10-11 21:28:23 +01:00
..
2011-09-14 19:11:32 -07:00
2011-09-14 19:11:32 -07:00