From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 16 Jul 2014 17:43:57 +0000 (-0400)
Subject: - forwards-port changelog for ref #3093
X-Git-Tag: rel_0_9_7~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81f5631b44222d4479462a7ffc2d1871a74b3a0c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- forwards-port changelog for ref #3093
---

diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index 1c9e394691..24aff8800b 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -123,6 +123,20 @@
         Fixed bug in mutable extension where :class:`.MutableDict` did not
         report change events for the ``setdefault()`` dictionary operation.
 
+        .. seealso::
+
+            :ticket:`3093`
+
+    .. change::
+        :tags: bug, ext
+        :versions: 0.9.5, 1.0.0
+        :pullreq: bitbucket:24
+        :tickets: 3093, 3051
+
+        Fixed bug where :meth:`.MutableDict.setdefault` didn't return the
+        existing or new value (this bug was not released in any 0.8 version).
+        Pull request courtesy Thomas Hervé.
+
     .. change::
         :tags: bug, mysql
         :versions: 0.9.5, 1.0.0
diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index f56b50d3d8..adfdae83d2 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -150,15 +150,6 @@
         Added support for Postgresql JSONB via :class:`.JSONB`.  Pull request
         courtesy Damian Dimmich.
 
-    .. change::
-        :tags: bug, ext
-        :versions: 1.0.0
-        :pullreq: bitbucket:24
-        :tickets: 3093
-
-        Fixed bug where :meth:`.MutableDict.setdefault` didn't return the
-        existing or new value.  Pull request courtesy Thomas Hervé.
-
     .. change::
         :tags: feature, mssql
         :pullreq: github:98