Merge branch '1.12' into 1.13

Conflicts:
	sites/www/changelog.rst
This commit is contained in:
Jeff Forcier 2014-03-13 21:36:48 -07:00
commit 9695500303
1 changed files with 3 additions and 0 deletions

View File

@ -2,6 +2,9 @@
Changelog Changelog
========= =========
* :release:`1.12.3 <2014-03-13>`
* :release:`1.11.5 <2014-03-13>`
* :release:`1.10.7 <2014-03-13>`
* :feature:`16` **Python 3 support!** Our test suite passes under Python 3, and * :feature:`16` **Python 3 support!** Our test suite passes under Python 3, and
it (& Fabric's test suite) continues to pass under Python 2. it (& Fabric's test suite) continues to pass under Python 2.