Merge in version bump.

diff --git a/ChangeLog b/ChangeLog
index ca2fe28149188ecd350c8e41a1550c3647aa5421..589f002aa6e024677c59599a5b03080082f303e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
-  * Bug lp:633247
-
+0.46 Mon Feb 14 10:28:01 PST 2011
+  * Fixes a number of corner case bugs.
+  * Fixes related to OpenBSD.
+  * Better testing for protocol version.
+  * Removes special case infinite wait on blocking setup.
 
 0.45 Tue Feb  8 16:02:06 PST 2011
   * Add support for systemtap

diff --git a/configure.ac b/configure.ac
index 5b87bddcbe713ce03554eef1605847f433c6a1ff..8473f1bbab0c4899790cefdd4268b6f4f771c137 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.45],[http://libmemcached.org/])
+AC_INIT([libmemcached],[0.46],[http://libmemcached.org/])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)