Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 5 Oct 2012 01:41:56 +0000 (03:41 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 5 Oct 2012 01:41:56 +0000 (03:41 +0200)

Trivial merge