From: Adam Dickmeiss Date: Thu, 3 Nov 2011 14:54:42 +0000 (+0100) Subject: Merge branch 'master' into bug_4688 X-Git-Tag: v1.6.6~53 X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=67c51b2822602e8817c2c7468c112dd35c125405;p=pazpar2-moved-to-github.git Merge branch 'master' into bug_4688 --- 67c51b2822602e8817c2c7468c112dd35c125405