From: mike bayer <mike_mp@zzzcomputing.com>
Date: Mon, 9 Jan 2017 22:42:03 +0000 (-0500)
Subject: Merge "Adapt from "localparent" in joinedloader"
X-Git-Tag: rel_1_1_5~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e251f64d686ca62a338c53d40ca72bf7a3cc82cd;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge "Adapt from "localparent" in joinedloader"
---

e251f64d686ca62a338c53d40ca72bf7a3cc82cd