Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorMike Taylor <mike@indexdata.com>
Thu, 10 Nov 2011 11:13:25 +0000 (11:13 +0000)
committerMike Taylor <mike@indexdata.com>
Thu, 10 Nov 2011 11:13:25 +0000 (11:13 +0000)

Trivial merge