Skip to content
Browse files

Merge branch '1.2'

Conflicts:
	docs/changelog.rst
	fabric/version.py
  • Loading branch information...
2 parents 87ebc18 + 2f2a09d commit 97ebf6399a37fbedd865a54ed8063aa2397fc642 @bitprophet bitprophet committed Oct 23, 2011
Showing with 3 additions and 0 deletions.
  1. +3 −0 docs/changelog.rst
View
3 docs/changelog.rst
@@ -25,6 +25,9 @@ would have also been included in the 1.2 line.
Changelog
=========
+* :release:`1.2.3 <2011-10-23>`
+* :release:`1.1.5 <2011-10-23>`
+* :release:`1.0.5 <2011-10-23>`
* :support:`275` To support an edge use case of the features released in
:issue:`19`, and to lay the foundation for :issue:`275`, we have forked
Paramiko into the `Python 'ssh' library <http://pypi.python.org/pypi/ssh/>`_

0 comments on commit 97ebf63

Please sign in to comment.
Something went wrong with that request. Please try again.