Merge branch 'da/maint-python-startup' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Apr 2010 05:29:07 +0000 (22:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Apr 2010 05:29:07 +0000 (22:29 -0700)
* da/maint-python-startup:
Makefile: Remove usage of deprecated Python "has_key" method

1  2 
Makefile
diff --cc Makefile
Simple merge