Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 21 Oct 2014 08:24:09 +0000 (08:24 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 21 Oct 2014 08:24:09 +0000 (08:24 +0000)
Conflicts:
NEWS


Trivial merge