Merge branch 'da/maint-python-startup' into next
commitca6897a177434d39f07ab3261c53faa7a5583c9e
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Apr 2010 20:12:27 +0000 (1 13:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Apr 2010 20:12:27 +0000 (1 13:12 -0700)
treea5a7cf22943c429705fa28d7c728ccdd9c7af34e
parent164b1f4fd1085a4a8e230b3938bfab15e7750674
parent0ae08401beb0daef9946b6fe25224a4cf167c655
Merge branch 'da/maint-python-startup' into next

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