From: Dennis Schafroth Date: Fri, 25 Nov 2011 10:25:57 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.6.6~4 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=33999a37cea2013f040e1726805d248b377a3388;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- 33999a37cea2013f040e1726805d248b377a3388