Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries.

Now we're even. :-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 7e945604eb500583e3aa5f46ef8d24f4dce5b0bf..3a1eea893a3ab73a0e687fce8cdcb12351082417 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -64,6 +64,8 @@ Core and builtins
 Library
 -------
 
+- Bug #1224621: make tabnanny recognize IndentationErrors raised by tokenize.
+
 - Patch #1536071: trace.py should now find the full module name of a
   file correctly even on Windows.
 
@@ -82,6 +84,8 @@ Library
 Extension Modules
 -----------------
 
+- Patch #1511317: don't crash on invalid hostname (alias) info.
+
 - Patch #1535500: fix segfault in BZ2File.writelines and make sure it
   raises the correct exceptions.