Melanie 2f0a3391ee Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor		2010-10-24 17:21:16 +02:00
..
Implementation	Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor	2010-10-24 17:21:16 +02:00
Interface	Merge branch 'master' into careminster-presence-refactor	2010-10-18 20:30:46 +01:00
Runtime	Merge branch 'master' into careminster-presence-refactor	2010-10-18 20:30:46 +01:00