Merge remote-tracking branch 'origin/master'

Browse Source

Conflicts:
	.travis.yml
	MySQLdb/tests/test_MySQLdb_capabilities.py
	MySQLdb/tests/test_MySQLdb_dbapi20.py
	MySQLdb/tests/test_MySQLdb_nonstandard.py

...

This commit is contained in:

farcepest

2012-10-02 14:39:15 -04:00

parent e2c396c245 02d94c48ff

commit 080902e21e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available