Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-06-14 02:49:15 +01:00
21 changed files with 709 additions and 445 deletions