Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Mon, 21 Mar 2011 13:49:09 +0000 (14:49 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 21 Mar 2011 13:49:09 +0000 (14:49 +0100)

Trivial merge