Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Sun, 8 Jun 2008 20:12:25 +0000 (22:12 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Sun, 8 Jun 2008 20:12:25 +0000 (22:12 +0200)

Trivial merge