Melanie d9b149b375 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
	OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs

2012-11-12 15:46:45 +00:00

..

XmlRpcGridRouterModule.cs

Two more modules converted: XmlRpcGridRouterModule and XmlRpcRouterModule.

2012-11-11 16:44:59 -08:00

XmlRpcRouterModule.cs

Merge branch 'master' into careminster

2012-11-12 15:46:45 +00:00