Merge for version.

diff --git a/ChangeLog b/ChangeLog
index c601718bd529399cded4f1ccf92b35e93e2017dd..f3ab6d6ca69d3bfe8e9777b39532ac4a60eef3bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1.0.4 Thu Jan 26 22:33:54 PST 2012
+* Fix for memcached_dump().
+* Additional testing for memcached_stat_execute().
+
 1.0.3 Sun Jan  8 18:11:36 PST 2012
 * Increased size of sort buffer used during Ketama.
 * Added support for new behavior to handle dead servers.

diff --git a/configure.ac b/configure.ac
index d2183085878513513158ef37923c59dcc803c3dd..aa79d138301a81d382de1673bb545da0e6236e94 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[1.0.3],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.4],[http://libmemcached.org/])
 
 AC_CONFIG_AUX_DIR(config)