From: Dennis Schafroth Date: Mon, 19 Dec 2011 11:06:12 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.6.7~14 X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=aa966490b0309bdecb56a114dc68b9dc7fbe3d2d;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- aa966490b0309bdecb56a114dc68b9dc7fbe3d2d