From 5865ec3970cead5b2cf3dd255a55cf2e1869e330 Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Tue, 04 Nov 2003 16:59:55 +0000
Subject: resloved merge conflict

---
(limited to 'docs/README')

--
cgit v0.9.0.2