Melanie 508bfa1de8 Merge branch 'master' into careminster-presence-refactor		2010-06-12 01:26:55 +01:00
..
SimpleModule	Merge branch 'master' into careminster-presence-refactor	2010-06-12 01:26:55 +01:00