Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2...
authorDennis Schafroth <dennis@indexdata.com>
Thu, 3 May 2012 12:49:07 +0000 (14:49 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 3 May 2012 12:49:07 +0000 (14:49 +0200)

Trivial merge