# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1159616448 -7200
# Node ID 1ebd2e7ea39517359bf58bf78e3ea842ea497109
# Parent  abfe3ca42c359709c4178da039bb804f1b6215ff# Parent  d3bfa9e9d88c33502ebc366699ae29766288bf10
Merge with myself

diff -r d3bfa9e9d88c -r 1ebd2e7ea395 mcabber/ChangeLog
--- a/mcabber/ChangeLog	Fri Sep 29 21:50:28 2006 +0200
+++ b/mcabber/ChangeLog	Sat Sep 30 13:40:48 2006 +0200
@@ -1,3 +1,9 @@
+mcabber (0.8.3-dev)
+
+ * 
+
+ -- Mikael, ?
+
 mcabber (0.8.2)
 
  * Fix a freeze with UTF-8 locales
diff -r d3bfa9e9d88c -r 1ebd2e7ea395 mcabber/configure.ac
--- a/mcabber/configure.ac	Fri Sep 29 21:50:28 2006 +0200
+++ b/mcabber/configure.ac	Sat Sep 30 13:40:48 2006 +0200
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([mcabber],[0.8.2],[mcabber@lilotux.net])
+AC_INIT([mcabber],[0.8.3-dev],[mcabber@lilotux.net])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src])
 AM_CONFIG_HEADER(config.h)
diff -r d3bfa9e9d88c -r 1ebd2e7ea395 mcabber/doc/mcabber.1.txt
--- a/mcabber/doc/mcabber.1.txt	Fri Sep 29 21:50:28 2006 +0200
+++ b/mcabber/doc/mcabber.1.txt	Sat Sep 30 13:40:48 2006 +0200
@@ -1,7 +1,7 @@
 MCABBER(1)
 ===========
 Mikael BERTHE <mcabber@lilotux.net>
-v0.8.2, September 2006
+v0.8.3-dev, October 2006
 
 NAME
 ----