]> granicus.if.org Git - python/commitdiff
merged
authorMartin v. Löwis <martin@v.loewis.de>
Sun, 25 Sep 2011 15:36:31 +0000 (17:36 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Sun, 25 Sep 2011 15:36:31 +0000 (17:36 +0200)
1  2 
Makefile.pre.in

diff --cc Makefile.pre.in
Simple merge