From a7e44d7ae3de23239044b2aa267dcd24b41e6af3 Mon Sep 17 00:00:00 2001
From: millette <millette@controlyourself.ca>
Date: Mon, 24 Nov 2008 00:05:56 -0500
Subject: [PATCH] fixing README conflict

darcs-hash:20081124050556-099f7-3f0df19cfc3ecbf128cfff6db6f364110eff61d9.gz
---
 README | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 6187ac07df..7ce3b9457f 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
 README
 ------
 
-Laconica 0.6.2
-13 November 2008
+Laconica 0.6.3
+23 November 2008
 
 This is the README file for Laconica, the Open Source microblogging
 platform. It includes installation instructions, descriptions of
@@ -72,7 +72,7 @@ New this version
 ================
 
 This is a minor feature and security improvement version from version
-0.6.1 (release 6 Oct 2008). Notable features of version 0.6.2 include:
+0.6.2 (release 13 Nov 2008). Notable features of version 0.6.3 include:
 
 - 'nudge' functionality to tell a user that they're missed.
 - Links to related RSS/Atom feeds on all pages.