Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Dec 2008 06:41:27 +0000 (22:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Dec 2008 06:41:27 +0000 (22:41 -0800)
* maint:
work around Python warnings from AsciiDoc
git-svn: Make following parents atomic

No differences found