Merge branch '1.10'

Conflicts:
	NEWS
	setup.py

3 files changed, 11 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index ef85effe..7365e4d7 100644
--- a/NEWS
+++ b/NEWS
@@ -12,8 +12,8 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/.
 Releases
 ========
 
-v1.11.0 (DD MM YYYY)
---------------------
+v1.11.0 (26th Jul 2013)
+-----------------------
 
 * #98: On Windows, when interacting with the PuTTY PAgeant, Paramiko now
   creates the shared memory map with explicit Security Attributes of the user,
@@ -29,11 +29,11 @@ v1.11.0 (DD MM YYYY)
   against duplicate entries during subsequent `known_hosts` loads.) Thanks to
   `@sunweaver` for the contribution.
 
-v1.10.2 (DD MM 2013)
---------------------
+v1.10.2 (26th Jul 2013)
+-----------------------
 
-* #153, #67: Warn on parse failure when reading known_hosts
-  file. Thanks to `@glasserc` for patch.
+* #153, #67: Warn on parse failure when reading known_hosts file. Thanks to
+  `@glasserc` for patch.
 * #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch
   & patch.
 
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index b305d9c4..d720e37e 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -57,7 +57,7 @@ if sys.version_info < (2, 5):
 
 
 __author__ = "Jeff Forcier <jeff@bitprophet.org>"
-__version__ = "1.10.1"
+__version__ = "1.10.2"
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/setup.py b/setup.py
index 02a71e58..e94b9022 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,11 @@ if sys.platform == 'darwin':
 
 
 setup(name = "paramiko",
+<<<<<<< HEAD
       version = "1.11.0",
+=======
+      version = "1.10.2",
+>>>>>>> 1.10
       description = "SSH2 protocol library",
       author = "Jeff Forcier",
       author_email = "jeff@bitprophet.org",