From: Adam Dickmeiss Date: Sun, 6 Jan 2013 15:26:59 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.6.24~4 X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=258ff04d4d283cd7a8545b0889f95c4d3daf7ab6;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- 258ff04d4d283cd7a8545b0889f95c4d3daf7ab6