Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Wed, 24 Aug 2011 10:33:41 +0000 (12:33 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 24 Aug 2011 10:33:41 +0000 (12:33 +0200)

Trivial merge