Preparing for 1.2.5.

2 files changed, 16 insertions, 1 deletions

diff --git a/bitlbee.h b/bitlbee.h
index 326e944d..15592020 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -34,7 +34,7 @@
 #define _WIN32_WINNT 0x0501
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.2.4"
+#define BITLBEE_VERSION "1.2.5"
 #define VERSION BITLBEE_VERSION
 
 #define MAX_STRING 511
diff --git a/doc/CHANGES b/doc/CHANGES
index 1bfd71d4..a0e9b30b 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -3,6 +3,21 @@ found in the bzr commit logs, for example you can try:
 
 http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
 
+Version 1.2.5:
+- Many bug fixes, including a fix for MSN login issues, Jabber login timing
+  issues, Yahoo! crashes at login time with huge contact lists,
+- Avoid linking in a static version of libresolv now that glibc has all
+  relevant functions available in the dynamic version.
+- Improved away state code and added the ability to set (non-away) status
+  messages using "set status" (also possible per account).
+- Added a post-1.2 equivalent of encode/decode to quickly encrypt/decrypt
+  passwords in a way that BitlBee can read them.
+- Allow using the full name for generating nicknames, instead of just the
+  handle. This is especially useful when using the Facebook XMPP server.
+- Auto reconnect is now enabled by default since all protocols can properly
+  detect cases where auto reconnect should be avoided (i.e. concurrent
+  logins).
+
 Version 1.2.4:
 - Most important change (and main reason for releasing now): Upgraded Yahoo!
   module to a newer version to get it working again.