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

avinationmerge
Melanie Thielker 2010-05-03 23:47:50 +02:00
commit 87e0c17707

Diff Content Not Available