projects / pazpar2-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9faf31e aea98cc)
Merge branch 'master' into block-error-warning
authorDennis Schafroth <dennis@indexdata.com>
Wed, 7 Mar 2012 09:59:43 +0000 (10:59 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 7 Mar 2012 09:59:43 +0000 (10:59 +0100)
Fix conflicts:
test/test_termlist_block_10.res
test/test_termlist_block_5.res


Trivial merge
Metasearcher