Merge 0.11 release branch
diff --git a/ChangeLog b/ChangeLog
index 3c5a358..c286c03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-01  Jean-Paul Calderone  <exarkun@twistedmatrix.com>
+
+	* Release 0.11
+
 2010-10-07  Jean-Paul Calderone  <exarkun@twistedmatrix.com>
 
 	* Initial support for Python 3.x throughout the codebase.