Merge branch '2.4' into 2.5

weaverryan · weaverryan · commit 30bb6c55bea5 · 2014-08-04T18:30:58.000-04:00
* 2.4:
  Typo
diff --git a/contributing/community/releases.rst b/contributing/community/releases.rst
@@ -99,7 +99,7 @@ This results in very predictable dates and maintenance periods:
 +---------+---------+---------------------+-------------+
 | 2.4     | 11/2013 | 07/2014 (8 months)  | 01/2015     |
 +---------+---------+---------------------+-------------+
-| 2.5     | 05/2014 | 01/2015 (8 months)  | 07/2016     |
+| 2.5     | 05/2014 | 01/2015 (8 months)  | 07/2015     |
 +---------+---------+---------------------+-------------+
 | 2.6     | 11/2014 | 07/2015 (8 months)  | 01/2016     |
 +---------+---------+---------------------+-------------+
