# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1163933474 -3600
# Node ID f7ef8003fc3592393e99640ea3eb552228a20dee
# Parent  94d9a3cbb211a84eaf101f9b31499e035045356a# Parent  3e3137ebc57c99947d7a11a5fd1669154e06be21
Merge 0.8.3 stable branch

diff -r 94d9a3cbb211 -r f7ef8003fc35 .hgtags
--- a/.hgtags	Sat Nov 18 15:48:49 2006 +0100
+++ b/.hgtags	Sun Nov 19 11:51:14 2006 +0100
@@ -19,3 +19,4 @@
 5c1dfc8e54d7b4e0eaa269d235792d9bab4982b7 0.8.0
 e79d82933deab89c01a94c68f9dd13a3355ce220 0.8.1
 fc98d932af4f9eebcab14ef82ea8c10a86c4c3fd 0.8.2
+3c8163360a9fb00628b24b27135a216c7de01948 0.8.3
diff -r 94d9a3cbb211 -r f7ef8003fc35 mcabber/AUTHORS
--- a/mcabber/AUTHORS	Sat Nov 18 15:48:49 2006 +0100
+++ b/mcabber/AUTHORS	Sun Nov 19 11:51:14 2006 +0100
@@ -6,14 +6,16 @@
 Thanks to the libjabber, cabber and centericq projects authors.
 Thanks to the Gaim project, and to all members of the Jabber community!
 
-Thanks to Michal Jeczalik Jr and Philip M. White for their help (documentation,
-suggestions, etc.).
+Thanks to Michal Jeczalik Jr (aka salvador) and Philip M. White (aka pmw)
+for their help (documentation, suggestions, etc.).
 
 Thanks to the following contributors:
   Reimar Döffinger
   Jefferson Ogata
   Sören Andersen
   Christof Meerwald
+  Myhailo Danylenko
+  Alexis Hildebrandt
 
 =====
 Here is the original acknowledgement from the cabber project:
diff -r 94d9a3cbb211 -r f7ef8003fc35 mcabber/ChangeLog
--- a/mcabber/ChangeLog	Sat Nov 18 15:48:49 2006 +0100
+++ b/mcabber/ChangeLog	Sun Nov 19 11:51:14 2006 +0100
@@ -1,9 +1,21 @@
-mcabber (0.8.3-dev)
+mcabber (0.8.4-dev)
 
  * 
 
  -- Mikael, ?
 
+mcabber (0.8.3)
+
+ * Fix truncation of UTF-8 buddy names in the roster (Myhailo Danylenko)
+ * Fix SSL support on OS X (Alexis Hildebrandt)
+ * Fix a freeze with some mistakes in the configuration file
+ * Update the sample event script to be more portable
+ * Fix some UTF-8 related issues
+ * Fix permissions of help files
+ * Correctly display the first message of a buffer (it wasn't wrapped)
+
+ -- Mikael, 2006-11-16
+
 mcabber (0.8.2)
 
  * Fix a freeze with UTF-8 locales
diff -r 94d9a3cbb211 -r f7ef8003fc35 mcabber/configure.ac
--- a/mcabber/configure.ac	Sat Nov 18 15:48:49 2006 +0100
+++ b/mcabber/configure.ac	Sun Nov 19 11:51:14 2006 +0100
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([mcabber],[0.8.3-dev],[mcabber@lilotux.net])
+AC_INIT([mcabber],[0.8.4-dev],[mcabber@lilotux.net])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src])
 AM_CONFIG_HEADER(config.h)
diff -r 94d9a3cbb211 -r f7ef8003fc35 mcabber/doc/help/Makefile.am
diff -r 94d9a3cbb211 -r f7ef8003fc35 mcabber/doc/mcabber.1.html
diff -r 94d9a3cbb211 -r f7ef8003fc35 mcabber/doc/mcabber.1.txt
--- a/mcabber/doc/mcabber.1.txt	Sat Nov 18 15:48:49 2006 +0100
+++ b/mcabber/doc/mcabber.1.txt	Sun Nov 19 11:51:14 2006 +0100
@@ -1,7 +1,7 @@
 MCABBER(1)
 ===========
 Mikael BERTHE <mcabber@lilotux.net>
-v0.8.3-dev, October 2006
+v0.8.4-dev, November 2006
 
 NAME
 ----
diff -r 94d9a3cbb211 -r f7ef8003fc35 mcabber/src/commands.c
diff -r 94d9a3cbb211 -r f7ef8003fc35 mcabber/src/jab_iq.c
diff -r 94d9a3cbb211 -r f7ef8003fc35 mcabber/src/screen.c