Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Wed, 7 Mar 2012 11:21:04 +0000 (11:21 +0000)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 7 Mar 2012 11:21:04 +0000 (11:21 +0000)

Trivial merge