summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-09-27 21:57:16 -0700
committerJeff Forcier <jeff@bitprophet.org>2013-09-27 21:57:16 -0700
commitf88875da3fdf7839f2167e5991fe603b619eae5a (patch)
treeecd6b8f13fdf0c8bb1740265001fd141e0331a08
parent07e61c35528f67a23701cd33421b7bd0b25f09a9 (diff)
parent8fcccce3d50b6abed92ed36224625e632671fc72 (diff)
Merge branch '1.10' into 1.11
-rw-r--r--NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index e9ca6f1d..caabc651 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
-----------------------