Simon McVittie 531321740c Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar ... Conflicts: services/presence/server_plugin.py		2007-05-16 12:30:49 +01:00
..
clipboard
console
presence
Makefile.am