Permalink
Browse files

Merge branch '1.1' into 1.2

Conflicts:
	fabric/version.py
  • Loading branch information...
2 parents d68b3b0 + dc983cd commit f8865e2bc33571e77c2cc5439fe69b55dd32a24a @bitprophet bitprophet committed Nov 8, 2011
Showing with 1 addition and 0 deletions.
  1. +1 −0 docs/changelog.rst
View
@@ -25,6 +25,7 @@ would have also been included in the 1.2 line.
Changelog
=========
+* :release:`1.1.6 <2011-11-07>`
* :support:`459` Update our `setup.py` files to note that PyCrypto released
2.4.1, which fixes the setuptools problems.
* :support:`467` (also :issue:`468`, :issue:`469`) Handful of documentation

0 comments on commit f8865e2

Please sign in to comment.