Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 1 May 2012 10:22:06 +0000 (12:22 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 1 May 2012 10:22:06 +0000 (12:22 +0200)

Trivial merge