Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 7 Nov 2013 10:13:22 +0000 (11:13 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 7 Nov 2013 10:13:22 +0000 (11:13 +0100)

Trivial merge