From: Dennis Schafroth Date: Fri, 30 Sep 2011 12:34:11 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.6.4~5^2~36^2 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=648b84d69294f138c3513992322813b94ed88c17;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- 648b84d69294f138c3513992322813b94ed88c17