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

Trivial merge