Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
avinationmerge
Melanie 2012-10-02 00:03:37 +01:00
commit 21c83d6238

Diff Content Not Available