From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 4 May 2016 19:52:05 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/pr/268'
X-Git-Tag: rel_1_1_0b1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cba9513bc9687aaa82b80861233558fde2059079;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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

cba9513bc9687aaa82b80861233558fde2059079