From: Dennis Schafroth Date: Mon, 17 Jan 2011 15:31:57 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.5.2~6 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=98cb117cf59c9beb7cf6f02af046338f3c2e2169;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- 98cb117cf59c9beb7cf6f02af046338f3c2e2169