[Python-checkins] r73110 - in python/branches/py3k: Lib/ipaddr.py

[gregory.p.smith]

Author: gregory.p.smith
Date: Mon Jun  1 19:43:35 2009
New Revision: 73110

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/ipaddr.py

Modified: python/branches/py3k/Lib/ipaddr.py
==============================================================================
--- python/branches/py3k/Lib/ipaddr.py	(original)
+++ python/branches/py3k/Lib/ipaddr.py	Mon Jun  1 19:43:35 2009
@@ -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 @@
 
 """
 
-__version__ = '1.0.2'
+__version__ = '1.1.0'
 
 import struct