From: mike bayer <mike_mp@zzzcomputing.com>
Date: Tue, 5 Sep 2017 13:46:05 +0000 (-0400)
Subject: Merge "Guard against KeyError in session.merge after check for identity" into rel_1_1
X-Git-Tag: rel_1_1_14~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba9c238d7e53709d64516a7dcda8b312d15f08e5;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge "Guard against KeyError in session.merge after check for identity" into rel_1_1
---

ba9c238d7e53709d64516a7dcda8b312d15f08e5