Merge staging tree to 1.0 trunk.

diff --git a/ChangeLog b/ChangeLog
index 868923e77f1881964f6172695a6df297ec0987b5..301d56b2c224da262053d34b47886128821ee272 100644 (file)
--- 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.