Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Apr 2010 06:54:04 +0000 (23:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Apr 2010 06:54:04 +0000 (23:54 -0700)
* maint:
Documentation/Makefile: fix interrupted builds of user-manual.xml

Trivial merge