From: Martin Mares <mj@albireo.ucw.cz>
Date: Thu, 9 Feb 2006 14:14:11 +0000 (+0100)
Subject: Merge branch 'master' of cvs.ucw.cz:/home/mj/GIT/vcut
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=8e7ba85c5fcea349e9bff64f03a4c7dfc9761366;p=vcut.git

Merge branch 'master' of cvs.ucw.cz:/home/mj/GIT/vcut
---

8e7ba85c5fcea349e9bff64f03a4c7dfc9761366
diff --cc README
index 930e32a,7993a89..36fe770
--- a/README
+++ b/README
@@@ -1,2 -1,2 +1,2 @@@
  This is a completely unimportant file.
- And another very important commit...
 -And another unimportant commit...
++Resolved version.