From 5a189ef664c5ef2511892f8eaf857816ac15f1d4 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Wed, 26 Oct 2011 08:46:56 -0700
Subject: [PATCH] Merge in version 1.0.2

---
 ChangeLog    | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d0f021c9..95eff39b 100644
--- 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 02257690..c1b4b222 100644
--- 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)
 
-- 
2.30.2