Merge branch '1.10' into 1.11

477fcae54622 · Jeff Forcier · 929800eab379 · 9dfff8cf6167 · 477fcae5
Commit 477fcae54622 authored 11 years ago by Jeff Forcier
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,8 @@
  & 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)
 -----------------------