Merge branch 'maint'
commita27d83aee906a767ae12dc39cd0aa5b42448bd6c
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 22:38:00 +0000 (10 14:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 22:38:00 +0000 (10 14:38 -0800)
tree53dcd92312302b6097e8306da360e783d0ae7e4e
parent99621af877fcc33d2f374cde1e55bacbaefeef17
parentbf7c3f749db88906dfb040194974808b6151ec22
Merge branch 'maint'

* maint:
  Prepare for 1.8.1.1
  Makefile: detect when PYTHON_PATH changes (cherry-picked)