Files
opensim/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule
Melanie 5837e731bf Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
2012-12-04 23:01:18 +00:00
..
2012-12-03 20:16:44 -05:00