From: Sebastian Hammer <quinn@indexdata.com>
Date: Fri, 27 Mar 2009 12:34:52 +0000 (+0000)
Subject: Resolved conflicts
X-Git-Tag: v1.1.0~34
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=fdd46fed9d0fb8ed59a222bbd8ec4321d46fb3c9;p=pazpar2-moved-to-github.git

Resolved conflicts

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

Conflicts:

	etc/cf.xsl
---

fdd46fed9d0fb8ed59a222bbd8ec4321d46fb3c9