Merge branch 'da/maint-python-startup'
commitb807c524df69fb44d7fe2a68a899985a7f7e6838
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:47 +0000 (6 14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:47 +0000 (6 14:50 -0700)
treef450071166fb2c29e5bd40ba5820e23b62df4b23
parent4a8295f582ce6ea643dc113038d30a8e1e3f40b9
parent0ae08401beb0daef9946b6fe25224a4cf167c655
Merge branch 'da/maint-python-startup'

* da/maint-python-startup:
  Makefile: Remove usage of deprecated Python "has_key" method
Makefile