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

avinationmerge
Mike Rieker 2010-05-27 22:14:43 -04:00
commit ea5bcc7b88

Diff Content Not Available