Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 17 Feb 2010 11:46:54 +0000 (12:46 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 17 Feb 2010 11:46:54 +0000 (12:46 +0100)

Trivial merge