Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Thu, 20 May 2010 11:13:03 +0000 (13:13 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 20 May 2010 11:13:03 +0000 (13:13 +0200)

Trivial merge