Files
opensim/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
Melanie bf283208df Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2013-07-29 02:08:05 +01:00

30 KiB