Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-08-01 18:00:04 +01:00
7 changed files with 559 additions and 557 deletions