Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Mon, 23 Apr 2012 10:40:15 +0000 (10:40 +0000)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 23 Apr 2012 10:40:15 +0000 (10:40 +0000)

Trivial merge