From: Dennis Schafroth Date: Tue, 1 Mar 2011 12:23:31 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.5.5~33 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=26201f579ec4a70553cf823a32820d9c09f96443;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- 26201f579ec4a70553cf823a32820d9c09f96443