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)
commitfdd46fed9d0fb8ed59a222bbd8ec4321d46fb3c9
tree130989e9f1060f89254f36201d296df948d42ebb
parentd6a14c8805733410835ec8b26b60819243f532e0
parentd0a576c466b4aad3cc044a459c4e36f719738ec5
Resolved conflicts

Merge branch 'master' of ssh://git/home/git/pub/pazpar2

Conflicts:

etc/cf.xsl