Merge branch 'maint'
commit5363d0744e7360beee990d3c2a8c1eb64a23071e
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Dec 2008 06:41:27 +0000 (9 22:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Dec 2008 06:41:27 +0000 (9 22:41 -0800)
treec533c7ab0c236fa5b621c5aaddb7aed3e734bae1
parent3aa1f7ca3779f73164b285c070b71abcdd7397c1
parentaa971cb9bf4105eefb435b9e6f282f019529c35f
Merge branch 'maint'

* maint:
  work around Python warnings from AsciiDoc
  git-svn: Make following parents atomic
Documentation/user-manual.txt
git-svn.perl
t/t9104-git-svn-follow-parent.sh