Merge branch 'py3k-backport' into testing

Browse Source

Conflicts:
	setup.py

...

This commit is contained in:

Valentin Lorentz 2013-05-11 11:55:43 +02:00

parent 3935152d65 cd6d9da8e4

commit 63f911b8a4

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

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

Diff Content Not Available