tree f450071166fb2c29e5bd40ba5820e23b62df4b23
parent 4a8295f582ce6ea643dc113038d30a8e1e3f40b9
parent 0ae08401beb0daef9946b6fe25224a4cf167c655
author Junio C Hamano <gitster@pobox.com> 1270590647 -0700
committer Junio C Hamano <gitster@pobox.com> 1270590647 -0700

Merge branch 'da/maint-python-startup'

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