]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorBrett Cannon <brett@python.org>
Sun, 23 Dec 2012 00:38:32 +0000 (19:38 -0500)
committerBrett Cannon <brett@python.org>
Sun, 23 Dec 2012 00:38:32 +0000 (19:38 -0500)
1  2 
Lib/modulefinder.py
Misc/ACKS
Misc/NEWS

Simple merge
diff --cc Misc/ACKS
index aa95d4dfb36df5984b799ddc575fa278639d5909,e4d178355af73b9f640f44371a8f0d217afc7242..90894a0020523c63c611f59d5dbc90b301389ef3
+++ b/Misc/ACKS
@@@ -900,10 -894,6 +900,7 @@@ Dan Parisie
  William Park
  Harri Pasanen
  GaĆ«l Pasgrimaud
- Berker Peksag
- Bo Peng
- Joe Peterson
 +Ashish Nitin Patil
  Randy Pausch
  Samuele Pedroni
  Justin Peel
diff --cc Misc/NEWS
Simple merge