Merge in latest release.

diff --git a/ChangeLog b/ChangeLog
index 06fc69e113141b1d65cc44d3d6bcc2d3d0a8ec20..cfa355bd817396baf33e75d2e5de481f0f89548b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-1.01 Mon Oct 24 08:00:48 PDT 2011
+1.0.2 Mon Oct 24 08:00:48 PDT 2011
 * Dropped libmemcached/memcached_util.h (undocumented header file)
 * Added memcached_touch() and memcached_touch_by_key()
 * UDP support restructured to toggle on a complete memcached_st structure.

diff --git a/configure.ac b/configure.ac
index 022576905c849270ba31c6a2f193ce4d3cdae9ff..c1b4b222f735afd59999582286979fdb560c2f42 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.01],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.2],[http://libmemcached.org/])
 
 AC_CONFIG_AUX_DIR(config)