Melanie bef03fb30b Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs		2013-08-17 03:23:45 +01:00
..
NeighbourServicesConnector.cs	Merge branch 'master' into careminster	2013-08-17 03:23:45 +01:00