Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Tue, 28 Dec 2010 15:19:37 +0000 (16:19 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 28 Dec 2010 15:19:37 +0000 (16:19 +0100)

Trivial merge