Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

This commit is contained in:
Melanie Thielker
2010-07-17 16:33:31 +02:00

Diff Content Not Available