Permalink
Browse files

Merge branch '1.2' into 1.3

Conflicts:
	requirements.txt
	setup.py
  • Loading branch information...
2 parents 5793980 + d68b3b0 commit 90978ca5f4b46bfa30ececf1cfa9a3e909d7c536 @bitprophet bitprophet committed Nov 4, 2011
Showing with 2 additions and 0 deletions.
  1. +2 −0 docs/changelog.rst
View
2 docs/changelog.rst
@@ -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.3.1 <2011-10-24>`

0 comments on commit 90978ca

Please sign in to comment.