]> granicus.if.org Git - python/commitdiff
- merge 3.4
authordoko@ubuntu.com <doko@ubuntu.com>
Thu, 30 Apr 2015 11:44:43 +0000 (13:44 +0200)
committerdoko@ubuntu.com <doko@ubuntu.com>
Thu, 30 Apr 2015 11:44:43 +0000 (13:44 +0200)
1  2 
Makefile.pre.in

diff --cc Makefile.pre.in
Simple merge