Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Wed, 2 Jun 2010 12:53:02 +0000 (14:53 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 2 Jun 2010 12:53:02 +0000 (14:53 +0200)

Trivial merge