Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 17 Apr 2013 11:44:53 +0000 (13:44 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 17 Apr 2013 11:44:53 +0000 (13:44 +0200)

Trivial merge