Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Tue, 20 Sep 2011 09:23:06 +0000 (11:23 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 20 Sep 2011 09:23:06 +0000 (11:23 +0200)

Trivial merge