Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 11 Mar 2011 12:27:56 +0000 (13:27 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 11 Mar 2011 12:27:56 +0000 (13:27 +0100)

Trivial merge