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

avinationmerge
Melanie Thielker 2010-07-17 16:33:31 +02:00
commit 22371ac527

Diff Content Not Available