From: Dennis Schafroth Date: Wed, 23 May 2012 11:10:42 +0000 (+0200) Subject: Merge branch 'master' into protocol-version2 X-Git-Tag: v1.6.13~1 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=c6da2571fa7768d12ddd0699666c073d488f7c74;p=pazpar2-moved-to-github.git Merge branch 'master' into protocol-version2 --- c6da2571fa7768d12ddd0699666c073d488f7c74