Merge branch 'ossau-gds-dev'
authorNeil Jerram <neil@ossau.uklinux.net>
Thu, 27 Aug 2009 21:52:20 +0000 (22:52 +0100)
committerNeil Jerram <neil@ossau.uklinux.net>
Thu, 27 Aug 2009 21:52:20 +0000 (22:52 +0100)
commit639bf3e507959ca53fef713306eb33f1074f1588
treef29a7fdd8e296976b041388892f68c97bc7469b2
parentcdc4f3db09727cc1613f7a2fd2335efa10a9d53f
parent8a40db3714628f88b138017835d448231257d13b
Merge branch 'ossau-gds-dev'

Conflicts:

THANKS
.gitignore
THANKS
emacs/gds-server.el
emacs/gds.el
module/ice-9/gds-client.scm
module/ice-9/gds-server.scm