]> granicus.if.org Git - python/commitdiff
Merge 3.3
authorMartin v. Löwis <martin@v.loewis.de>
Sat, 4 Jan 2014 10:21:15 +0000 (11:21 +0100)
committerMartin v. Löwis <martin@v.loewis.de>
Sat, 4 Jan 2014 10:21:15 +0000 (11:21 +0100)
1  2 
PC/python34stub.def

Simple merge