Merge branch 'master' into presence-refactor

This brings presence-refactor up to master again
This commit is contained in:
Melanie
2010-02-22 03:00:59 +00:00
39 changed files with 405 additions and 5161 deletions

File diff suppressed because it is too large Load Diff