]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
Merge branch 'master' into xdist_poc
authorMike Bayer <mike_mp@zzzcomputing.com>
Sat, 26 Jul 2014 23:04:07 +0000 (19:04 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sat, 26 Jul 2014 23:04:07 +0000 (19:04 -0400)
commite65cb04974cc35e6f8301b9b7bc2a02d11edf139
tree3e94242aeb6d6650720407f95a63f4c0e195ea39
parente602a731974bface5c25ff4e83e7e2bd153daa61
parentc85fa9fa50ca32523c160eaab58ab6d2b97aacc6
Merge branch 'master' into xdist_poc

Conflicts:
lib/sqlalchemy/engine/url.py
lib/sqlalchemy/testing/plugin/plugin_base.py