Melanie a6e305063e Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
	OpenSim/Services/Interfaces/IUserAccountService.cs

2012-01-02 21:41:36 +00:00

..

ScriptsHttpRequests.cs

Merge branch 'master' into careminster

2012-01-02 21:41:36 +00:00