From: Brian Aker <brian@tangent.org>
Date: Sun, 16 Sep 2012 23:31:57 +0000 (-0700)
Subject: Merge staging tree to 1.0 trunk.
X-Git-Tag: 1.0.11~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=8a971e97129f99102be7452b91865325d58b4a70;hp=af788b4b866ef0220dcdc4c357efbcbdb942cd27;p=awesomized%2Flibmemcached

Merge staging tree to 1.0 trunk.
---

diff --git a/ChangeLog b/ChangeLog
index 868923e7..301d56b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-1.0.10 
+1.0.11
+* Removed custom version of memcached.
+* Updated hardening rules.
+* Fixed a case where the return error from a socket connection differred from that of a TCP/IP socket.
+
+1.0.10 Sun Jul 29 21:50:15 PDT 2012
 * --disable-assert has been removed from configure, and --enable-assert has been added in its place.
 * Compiling fixes for Clang on OSX Mountain Lion.