From: Gregory P. Smith <greg@mad-scientist.com>
Date: Mon, 1 Jun 2009 17:43:35 +0000 (+0000)
Subject: Merged revisions 73109 via svnmerge from
X-Git-Tag: v3.1rc2~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ae35ea1d613ed6e01cbca20f08342393cadb663;p=thirdparty%2FPython%2Fcpython.git

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 e6b26e0ef5f1..96000af3cc0d 100644
--- 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