Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 8 May 2015 19:01:11 +0000 (19:01 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 8 May 2015 19:01:11 +0000 (19:01 +0000)

Trivial merge