Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Wed, 22 Feb 2012 13:39:52 +0000 (14:39 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 22 Feb 2012 13:39:52 +0000 (14:39 +0100)

Trivial merge