Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-10-13 18:44:58 +01:00
3 changed files with 1389 additions and 16 deletions