Melanie 31ab8b2fe0 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2012-05-05 10:32:04 +01:00

..

UrlModule.cs

Merge branch 'master' into careminster

2012-05-05 10:32:04 +01:00