Files
opensim/OpenSim/Framework/Servers/HttpServer
Melanie d3892bbd06 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-05 21:30:12 +00:00
..
2013-01-23 08:14:21 -05:00
2009-06-10 04:28:56 +00:00