From: Mike Bayer Date: Fri, 31 Jan 2014 22:27:55 +0000 (-0500) Subject: Merge branch 'fix-convenience-import' of github.com:witsch/sqlalchemy into t X-Git-Tag: rel_0_8_5~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95c370cc65bed337e0c295afbb87872740a6fbac;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Merge branch 'fix-convenience-import' of github.com:witsch/sqlalchemy into t --- 95c370cc65bed337e0c295afbb87872740a6fbac