From: Adam Dickmeiss Date: Tue, 8 Nov 2011 11:15:35 +0000 (+0100) Subject: Merge branch 'master' into bug_4688 X-Git-Tag: v1.6.6~44 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=fba15c69a3a51b91b1d4b2238991c91852b55639;p=pazpar2-moved-to-github.git Merge branch 'master' into bug_4688 --- fba15c69a3a51b91b1d4b2238991c91852b55639