Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2...
authorDennis Schafroth <dennis@indexdata.com>
Thu, 12 Apr 2012 11:31:35 +0000 (13:31 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 12 Apr 2012 11:31:35 +0000 (13:31 +0200)

Trivial merge