Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 14 May 2013 13:34:17 +0000 (15:34 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 14 May 2013 13:34:17 +0000 (15:34 +0200)

Trivial merge