Permalink
Browse files

Merge branch '1.1' into 1.2

  • Loading branch information...
2 parents 23da3d0 + 8ae3f63 commit d68b3b02a5cdef1162603e0ddb0791b785667af4 @bitprophet bitprophet committed Nov 4, 2011
Showing with 2 additions and 0 deletions.
  1. +2 −0 docs/changelog.rst
View
@@ -25,6 +25,8 @@ would have also been included in the 1.2 line.
Changelog
=========
+* :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
clarification tweaks. Thanks to Paul Hoffman for the patches.
* :release:`1.2.3 <2011-10-23>`

0 comments on commit d68b3b0

Please sign in to comment.