summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-05-28 10:51:36 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-05-28 10:51:36 -0400
commitd45dccf4ef6db592e73337da6a04ca1e4445341f (patch)
treedbebbe2b94a208660618e57f535f3ceb790f058f
parent2a6828a3a6f98a6f6e0e97b02b1c6e397130a473 (diff)
downloadpython-setuptools-git-d45dccf4ef6db592e73337da6a04ca1e4445341f.tar.gz
Add note about dropped support for Python 2.3
-rw-r--r--MERGE.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/MERGE.txt b/MERGE.txt
index f836f354..16fbdc68 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -78,6 +78,7 @@ Major Changes
packages.
* Sort order of Distributions in pkg_resources now prefers PyPI to external
links (Distribute issue 163).
+* Python 2.4 or greater is required (drop support for Python 2.3).
Minor Changes
-------------