Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 25 Nov 2013 09:16:23 +0000 (10:16 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 25 Nov 2013 09:16:23 +0000 (10:16 +0100)

Trivial merge