Merge branch 'bc/portable' into next
commita42305512032e39633c626d17bf7bb53c7a02b33
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jun 2010 04:02:44 +0000 (13 21:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jun 2010 04:02:44 +0000 (13 21:02 -0700)
tree7b580fb2ad22aed11d2a90f056dd471eeb8af40d
parent4a51ab1b2fe2733af7ac3b8722bf180e8e7b0029
parent23b093ee087e99049585487f59e262a0e0662b6e
Merge branch 'bc/portable' into next

* bc/portable:
  Remove python 2.5'isms
  Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS

Conflicts:
Makefile
Makefile