Melanie 3589acdab1 Merge branch 'master' into careminster ...

Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat

2013-11-23 19:13:22 +00:00

152 KiB

Raw Blame History

View Raw