Merge branch '1.10' into 1.11

This commit is contained in:
Jeff Forcier 2013-09-27 21:57:16 -07:00
commit f88875da3f
1 changed files with 2 additions and 0 deletions

2
NEWS
View File

@ -27,6 +27,8 @@ v1.10.4 (27th Sep 2013)
& patch.
* #200: Fix an exception-causing typo in `demo_simple.py`. Thanks to Alex
Buchanan for catch & Dave Foster for patch.
* #199: Typo fix in the license header cross-project. Thanks to Armin Ronacher
for catch & patch.
v1.11.1 (20th Sep 2013)
-----------------------