Files
opensim/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
Melanie 56f4adeb60 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
2013-06-18 01:50:08 +01:00

13 KiB