Merge with git+ssh://sgc@fondialog1.hum.uva.nl/fro/git/sgc.git
commit615e791faeb9fb95f0417ff967cf73b458740f0a
authorStefan de Konink <skinkie@xs4all.nl>
Sat, 12 May 2007 22:47:24 +0000 (13 00:47 +0200)
committerStefan de Konink <skinkie@xs4all.nl>
Sat, 12 May 2007 22:47:24 +0000 (13 00:47 +0200)
tree64bd7f305e5b72eff564664a60fa4c9c1387ae3c
parent1baf787c0b0492d6fe0920f5400aec46fcd16b46
parentee6ec023dedc27d37b1e6aad566270a4b69e9355
Merge ... git+ssh://sgc@fondialog1.hum.uva.nl/fro/git/sgc.git