From: Adam Dickmeiss Date: Fri, 16 Dec 2011 12:53:55 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.6.7~14^2 X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=0f2962d7d0164c415599f9b39c229bb9e69b98b6;hp=-c;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- 0f2962d7d0164c415599f9b39c229bb9e69b98b6