From 15ad7e1d93d376e44bc74e6f27a780ae91000855 Mon Sep 17 00:00:00 2001
From: Carl Meyer <carl@oddbird.net>
Date: Sat, 25 Jan 2014 17:40:25 -0700
Subject: [PATCH] Update AUTHORS and changelog.

---
 AUTHORS.rst |  3 ++-
 CHANGES.rst | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index e890afc..f5d50da 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -3,6 +3,7 @@ Alex Orange <crazycasta@gmail.com>
 Andy Freeland <andy@andyfreeland.net>
 Carl Meyer <carl@dirtcircle.com>
 Curtis Maloney <curtis@tinbrain.net>
+Den Lesnov
 Donald Stufft <donald.stufft@gmail.com>
 Douglas Meehan <dmeehan@gmail.com>
 Facundo Gaich <facugaich@gmail.com>
@@ -15,8 +16,8 @@ Jannis Leidel <jannis@leidel.info>
 Javier García Sogo <jgsogo@gmail.com>
 Jeff Elmore <jeffelmore.org>
 Keryn Knight <kerynknight.com>
-Den Lesnov
 Mikhail Silonov <silonov.pro>
+Patryk Zawadzki <patrys@room-303.com>
 Paul McLanahan <paul@mclanahan.net>
 Rinat Shigapov <rinatshigapov@gmail.com>
 Ryan Kaskel <dev@ryankaskel.com>
diff --git a/CHANGES.rst b/CHANGES.rst
index 45441a5..2dd8332 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,14 +4,18 @@ CHANGES
 master (unreleased)
 -------------------
 
+* Fix issue with attempt to access ``__slots__`` when copying
+  ``PassThroughManager``. Thanks Patryk Zawadzki. Merge of GH-105.
+
+* Improve ``InheritanceManager`` so any attributes added by using extra(select)
+  will be propagated onto children. Thanks Curtis Maloney. Merge of GH-101,
+  fixes GH-34.
+
 * Added ``InheritanceManagerMixin``, ``InheritanceQuerySetMixin``,
   ``PassThroughManagerMixin``, and ``QueryManagerMixin`` to allow composing
   their functionality with other custom manager/queryset subclasses (e.g. those
   in GeoDjango). Thanks Douglas Meehan!
 
-* Improve `InheritanceManager` so any attributes added by using extra(select)
-  will be propagated onto children.
-
 
 2.0 (2014.01.06)
 ----------------