]> granicus.if.org Git - python/commitdiff
Merge 3.5, issue #14209
authorŁukasz Langa <lukasz@langa.pl>
Sun, 12 Jun 2016 01:05:42 +0000 (18:05 -0700)
committerŁukasz Langa <lukasz@langa.pl>
Sun, 12 Jun 2016 01:05:42 +0000 (18:05 -0700)
1  2 
Lib/pkgutil.py
Misc/ACKS

diff --cc Lib/pkgutil.py
Simple merge
diff --cc Misc/ACKS
index 860eeb33aaa7cf82d804d0599c2905463966bb7c,632c85ccdd28ce22003ae27a62c51ca1ab12f8b7..b62bd51be1de1940bf5d42a0851239efcbee0d54
+++ b/Misc/ACKS
@@@ -1145,8 -1136,8 +1145,9 @@@ Ronny Pfannschmid
  Geoff Philbrick
  Gavrie Philipson
  Adrian Phillips
 +Dusty Phillips
  Christopher J. Phoenix
+ James Pickering
  Neale Pickett
  Jim St. Pierre
  Dan Pierson