From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 11 Nov 2016 21:33:01 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/pr/318'
X-Git-Tag: rel_1_1_4~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd93c6a116ff62040a938d5e63a2f71d6a2f3805;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge remote-tracking branch 'origin/pr/318'
---

dd93c6a116ff62040a938d5e63a2f71d6a2f3805