Merge from 3.4.2 release head back into 3.4 mainline.

98b3f5ff · Larry Hastings · 59b6796e · 1fc38640 · 98b3f5ff
Commit 98b3f5ff authored Oct 08, 2014 by Larry Hastings
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

__init__.py __init__.py +1 -1

No files found.
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@ used from a setup script as
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.2rc1"
+__version__ = "3.4.2"
 #--end constants--