projects / pazpar2-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6a14c8 d0a576c)
Resolved conflicts
authorSebastian Hammer <quinn@indexdata.com>
Fri, 27 Mar 2009 12:34:52 +0000 (12:34 +0000)
committerSebastian Hammer <quinn@indexdata.com>
Fri, 27 Mar 2009 12:34:52 +0000 (12:34 +0000)
Merge branch 'master' of ssh://git/home/git/pub/pazpar2

Conflicts:

etc/cf.xsl


Trivial merge
Metasearcher