diff options
| author | farcepest <farcepest@gmail.com> | 2012-10-02 14:39:15 -0400 |
|---|---|---|
| committer | farcepest <farcepest@gmail.com> | 2012-10-02 14:39:15 -0400 |
| commit | 080902e21ea5bbad87c548fb27b94c332e3cbf62 (patch) | |
| tree | 438ed5196942924e308394edea75b4de1eedbecc | |
| parent | e2c396c245afb0040169fc6a483fcf15a9210394 (diff) | |
| parent | 02d94c48ff2d957330f1a4817613628a8e0427a0 (diff) | |
| download | mysqldb1-080902e21ea5bbad87c548fb27b94c332e3cbf62.tar.gz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
.travis.yml
MySQLdb/tests/test_MySQLdb_capabilities.py
MySQLdb/tests/test_MySQLdb_dbapi20.py
MySQLdb/tests/test_MySQLdb_nonstandard.py
0 files changed, 0 insertions, 0 deletions