Handling merge

[m6w6/libmemcached] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 6500f2a26433a255d787214591059b1820569f39..f047278e7d889032500ad71db5163e6940fcb810 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
   * Added strings.h header for Solaris 9
   * Solaris 64bit fix.
   * Support for weighted Ketama from Yin Chen.
+  * Fix for Chinese 
+  * Fix for 0 length key to trigger bad key.
 
 0.22 Mon Jul 14 09:24:11 PDT 2008
   * Fix where master key was no being checked for "bad key"