Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 12 Jul 2013 08:44:24 +0000 (10:44 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 12 Jul 2013 08:44:24 +0000 (10:44 +0200)

Trivial merge