From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 25 Jul 2014 23:15:11 +0000 (-0400)
Subject: Merge branch 'master' into xdist_poc
X-Git-Tag: rel_1_0_0b1~278
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=306047c006336ce7d4b33e12236a12c985bdb8e2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'master' into xdist_poc
---

306047c006336ce7d4b33e12236a12c985bdb8e2