Melanie fdfc4ab2a8 Merge branch 'master' into careminster ... Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs		2012-01-06 00:08:18 +00:00
..
AssetService.cs	Merge branch 'master' into careminster	2012-01-06 00:08:18 +00:00
AssetServiceBase.cs	Fix the AssetServiceBase bug I introduced by reordering configuration load	2009-06-23 08:37:12 +00:00