From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 25 Mar 2009 09:52:02 +0000 (+0000)
Subject: I hate failed merges
X-Git-Tag: v1.1.0~34^2
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=d0a576c466b4aad3cc044a459c4e36f719738ec5;p=pazpar2-moved-to-github.git

I hate failed merges
---

d0a576c466b4aad3cc044a459c4e36f719738ec5