Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 12 Nov 2012 15:01:59 +0000 (16:01 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 12 Nov 2012 15:01:59 +0000 (16:01 +0100)

Trivial merge