Files
opensim/OpenSim/Framework/Servers/HttpServer
Melanie a7eb1b5b85 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
..
2013-01-23 08:14:21 -05:00
2009-06-10 04:28:56 +00:00