Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Sep 2013 09:23:56 +0000 (11:23 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Sep 2013 09:23:56 +0000 (11:23 +0200)

Trivial merge