Code

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)
commitdd0c5133c6994d2930485c579e701d79df632ded
tree42e0a9198ed7c9d356045652901ae8ce63b9dedd
parentf9dae0d3e63455206c1e1e169c76aca55aeb5d90
parent0ae08401beb0daef9946b6fe25224a4cf167c655
Merge branch 'da/maint-python-startup' into maint

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