]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
Merge branch 'mysqlclient' of https://bitbucket.org/methane/sqlalchemy into pr48
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 20 Mar 2015 19:17:07 +0000 (15:17 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 20 Mar 2015 19:17:07 +0000 (15:17 -0400)
commit824e9013797cc20538b8002643057b0104081c1a
treeb56eadbb6ed5ceae3e339a0cba4d221eee94b9b8
parentffddfe1b17b5c09dcb6289f807200f7c8279190e
parent69dadc88e0b95e0fe1936ae09fd7d3e085f1df0a
Merge branch 'mysqlclient' of https://bitbucket.org/methane/sqlalchemy into pr48

Conflicts:
lib/sqlalchemy/dialects/mysql/mysqldb.py
lib/sqlalchemy/dialects/mysql/mysqldb.py