Melanie 11eabf0e51 Merge branch 'master' into careminster-presence-refactor

2010-12-20 02:49:31 +00:00

..

Archiver

uncomment "load iar" help lines which added the --merge option

2010-12-18 00:59:37 +00:00

Transfer

Fix the inventory transfer module to not cause duplicated text IMs

2010-11-05 15:24:08 +01:00