Merge branch 'master' into python3

4 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f5a74da..37f62ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-26  Bob Halley  <halley@dnspython.org>
+
+	* (Version 1.8.0 released)
+
 2010-01-13  Bob Halley  <halley@dnspython.org>
 
 	* dns/dnssec.py: Added RSASHA256 and RSASHA512 codepoints; added
diff --git a/Makefile b/Makefile
index c0cad5e..3dbfe95 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ docclean:
 
 kits:
 	${PYTHON} ./setup.py sdist --formats=gztar,zip
-	${PYTHON} ./setup.py bdist_wininst
+#	${PYTHON} ./setup.py bdist_wininst
 #	${PYTHON} ./setup.py bdist_rpm
 
 tags:
diff --git a/dns/version.py b/dns/version.py
index 7a36775..dd135a1 100644
--- a/dns/version.py
+++ b/dns/version.py
@@ -17,7 +17,7 @@
 
 MAJOR = 1
 MINOR = 8
-MICRO = 0
+MICRO = 1
 RELEASELEVEL = 0x0f
 SERIAL = 0
 
diff --git a/setup.py b/setup.py
index 12fd2f1..21ebddf 100755
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
 import sys
 from distutils.core import setup
 
-version = '1.8.0'
+version = '1.8.1'
 
 kwargs = {
     'name' : 'dnspython',