diff options
| author | Andy Dustman <farcepest@gmail.com> | 2013-08-18 18:24:17 -0400 |
|---|---|---|
| committer | Andy Dustman <farcepest@gmail.com> | 2013-08-18 18:24:17 -0400 |
| commit | 32d0364176d350cdc2701d63c4f9b1f711ecbb44 (patch) | |
| tree | a49154fbafc0f1bdfd12240ed66e0e8d15112772 /MySQLdb/__init__.py | |
| parent | efb3bc3531d9c16da436423e7c496f7f819da3b6 (diff) | |
| parent | c8b2744ea2b1e4419b7e3d93928e92c95f366815 (diff) | |
| download | mysqldb1-MySQLdb-1.3.tar.gz | |
Merge branch 'master' into MySQLdb-1.3MySQLdb-1.3
Conflicts:
MySQLdb/connections.py
Diffstat (limited to 'MySQLdb/__init__.py')
0 files changed, 0 insertions, 0 deletions