Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Wed, 29 Feb 2012 11:20:45 +0000 (12:20 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 29 Feb 2012 11:20:45 +0000 (12:20 +0100)

Trivial merge