Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 27 Mar 2013 10:28:38 +0000 (11:28 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 27 Mar 2013 10:28:38 +0000 (11:28 +0100)

Trivial merge