Merge branch 'da/maint-python-startup'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:47 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:47 +0000 (14:50 -0700)
* da/maint-python-startup:
Makefile: Remove usage of deprecated Python "has_key" method

1  2 
Makefile
diff --cc Makefile
Simple merge