From: Adam Dickmeiss Date: Mon, 12 Dec 2011 15:44:18 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.6.7~21^2~6 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=cd1cd189dfb6e5883ef440f830cd81808f8e7441;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- cd1cd189dfb6e5883ef440f830cd81808f8e7441