Merge remote-tracking branch 'origin/0.12.0' into consume-0.12.0
diff --git a/configure.ac b/configure.ac
index aca6f30..f53fc3f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 AC_PREREQ(2.65)
 AC_CONFIG_MACRO_DIR([./aclocal])
 
-AC_INIT([thrift], [1.0.0-dev])
+AC_INIT([thrift], [1.0.0])
 
 AC_CONFIG_AUX_DIR([.])