Merge with git+ssh://sgc@fondialog1.hum.uva.nl/fro/git/sgc.git
commit7f79cf372bae97d4a76a78b5645a9de59c73a429
authorroot <root@fondialog1.hum.uva.nl>
Fri, 22 Jun 2007 14:42:30 +0000 (22 14:42 +0000)
committerroot <root@fondialog1.hum.uva.nl>
Fri, 22 Jun 2007 14:42:30 +0000 (22 14:42 +0000)
treef03ab4b13df3d7e5e1fc25ec49b005c5f6a9f256
parentd8afeeea0d9045c38ea829f8bbffd26efeede3ce
parentdf7cae733a738aacbc33ca650b2d66c64d6f7edf
Merge ... git+ssh://sgc@fondialog1.hum.uva.nl/fro/git/sgc.git