Merge with default.

1 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7cc0ddc..68d0504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,14 @@
 Change log for the astroid package (used to be astng)
 =====================================================
 
+--
+    * `Class.metaclass()` looks in ancestors when the current class
+      does not define explicitly a metaclass.
+
     * Do not cache modules if a module with the same qname is already
       known, and only return cached modules if both name and filepath
       match. Fixes pylint Bitbucket issue #136.
 
-
 2014-04-18  --  1.1.0
     * All class nodes are marked as new style classes for Py3k.