Preparing for v2.3.0v2.3.0beta/2.3

Signed-off-by: David Sommerseth <davids@redhat.com>

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 36b42f8..3f686dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 OpenVPN Change Log
 Copyright (C) 2002-2012 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
+2013.01.07 -- Version 2.3.0
+Gert Doering (2):
+      Fix parameter type for IP_TOS setsockopt on non-Linux systems.
+      Fix client crash on double PUSH_REPLY.
+
 2012.12.17 -- Version 2.3_rc2
 Adriaan de Jong (1):
       Fix --show-pkcs11-ids (Bug #239)
diff --git a/version.m4 b/version.m4
index ce085b2..233bd72 100644
--- a/version.m4
+++ b/version.m4
@@ -1,7 +1,7 @@
 dnl define the OpenVPN version
 define([PRODUCT_NAME], [OpenVPN])
 define([PRODUCT_TARNAME], [openvpn])
-define([PRODUCT_VERSION], [2.3_rc2])
+define([PRODUCT_VERSION], [2.3.0])
 define([PRODUCT_BUGREPORT], [openvpn-users@lists.sourceforge.net])
 define([PRODUCT_VERSION_RESOURCE], [2,3,0,0])
 dnl define the TAP version