]> granicus.if.org Git - python/commitdiff
merge #11696
authorMartin v. Löwis <martin@v.loewis.de>
Sun, 27 Mar 2011 19:09:00 +0000 (21:09 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Sun, 27 Mar 2011 19:09:00 +0000 (21:09 +0200)
1  2 
Misc/ACKS
Misc/NEWS

diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
index 1caef03fc60ce3c33cd05f4a6f22093ece683718,bfb9ff177b7c4b252d6c660096b14ec621dc5f8a..0c0e136db4f0ce1d5b48c497c5360df5cddd5687
+++ b/Misc/NEWS
@@@ -87,8 -49,8 +87,10 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11696: Fix ID generation in msilib.
 +- Issue #11692: Remove unnecessary demo functions in subprocess module.
 +
  - Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when
    trying to pack a negative (in-range) integer.