Justin Clark-Casey (justincc)
a133acbd5f
Merge branch 'iar-merge'
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
2010-08-04 20:56:52 +01:00
..
2010-06-30 22:07:28 +01:00
2010-07-30 21:41:44 +01:00
2010-06-13 19:06:22 -07:00
2010-05-14 21:25:14 +01:00
2010-05-15 01:07:45 +01:00
2010-07-20 21:32:13 +01:00
2010-06-28 16:04:12 -07:00
2010-01-29 07:21:06 +00:00
2010-07-30 21:58:24 +01:00
2010-01-29 07:21:06 +00:00
2010-08-04 02:46:30 +01:00
2010-08-04 20:56:52 +01:00
2010-01-29 07:21:06 +00:00
2009-08-21 15:47:55 +09:00
2010-03-19 15:16:44 -07:00