From: Ben Darnell <ben@bendarnell.com>
Date: Fri, 17 Jul 2015 16:28:31 +0000 (-0400)
Subject: Merge branch 'branch4.2'
X-Git-Tag: v4.3.0b1~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb12ad049f11b44e4d42a7c517ff654e7dd13262;p=thirdparty%2Ftornado.git

Merge branch 'branch4.2'
---

cb12ad049f11b44e4d42a7c517ff654e7dd13262
diff --cc docs/releases.rst
index 43c61887c,21c4e638b..07366cad5
--- a/docs/releases.rst
+++ b/docs/releases.rst
@@@ -4,7 -4,7 +4,8 @@@ Release note
  .. toctree::
     :maxdepth: 2
  
 +   releases/next
+    releases/v4.2.1
     releases/v4.2.0
     releases/v4.1.0
     releases/v4.0.2