Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Tue, 17 Aug 2010 12:32:46 +0000 (14:32 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 17 Aug 2010 12:32:46 +0000 (14:32 +0200)

Trivial merge