# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1210906951 0
# Node ID 06acaa3b765aeb77afae029dcd1cea4e8a94e6a9
# Parent  34259e92ed0861d0458bac2f3e336f82cf30c2c3# Parent  e6ec85b3d28f87bb5267089e50d2ef765c8a5c6d
merge of '2f76f01c0ca7594f3efba9430e8de027252c3fd0'
     and '4543673d65f212baabcd1140a9f7394b033db0ec'

diff -r e6ec85b3d28f -r 06acaa3b765a ChangeLog
--- a/ChangeLog	Fri May 16 02:52:40 2008 +0000
+++ b/ChangeLog	Fri May 16 03:02:31 2008 +0000
@@ -18,6 +18,8 @@
 	* MSN buddy list synchronization is now more forgiving, only asking about
 	  buddies who have disappeared completely from the server list and not
 	  those that have simply moved groups.
+	* IRC will now try to append 1-9 to your nick if it is in use, instead
+	  of substituting the last character with 1-9 where possiblea.
 
 	Pidgin:
 	* The typing notification in the conversation history can be disabled or
diff -r e6ec85b3d28f -r 06acaa3b765a po/ChangeLog
--- a/po/ChangeLog	Fri May 16 02:52:40 2008 +0000
+++ b/po/ChangeLog	Fri May 16 03:02:31 2008 +0000
@@ -8,7 +8,9 @@
 	* Dutch translation updated (Daniël Heres)
 	* English (British) translation updated (Luke Ross)
 	* Finnish translation updated (Timo Jyrinki)
+	* German translation updated (Björn Voigt)
 	* Hebrew translation updated (Shalom Craimer)
+	* Lithuanian translation updated (Laurynas Biveinis)
 	* Macedonian translation updated (Арангел Ангов)
 	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
 	* Occitan translation added (Yannig Marchegay)