Merged revisions 73109 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73109 | gregory.p.smith | 2009-06-01 10:40:41 -0700 (Mon, 01 Jun 2009) | 6 lines

  Sync up __version__ number with the version of the ipaddr-py project this
  library came from that it matches.
........

diff --git a/Lib/ipaddr.py b/Lib/ipaddr.py
index e6b26e0ef5f1d91963efd2ac227775eef8da23a3..96000af3cc0d1a64a574e4cc30998e0d4f355756 100644 (file)
--- a/Lib/ipaddr.py
+++ b/Lib/ipaddr.py
@@ -1,5 +1,6 @@
 # Copyright 2007 Google Inc.
 #  Licensed to PSF under a Contributor Agreement.
+#
 # See also: http://code.google.com/p/ipaddr-py/
 
 """An IPv4/IPv6 manipulation library in Python.
@@ -9,7 +10,7 @@ and prefixes.
 
 """
 
-__version__ = '1.0.2'
+__version__ = '1.1.0'
 
 import struct