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)
commit3e7f1e6ccbfdc652539caba61b9be40c5dd89793
tree3450376d8b04ba673210ba6adb53e5d6c0163b1b
parentddd02b70f0d80fc3cac6b2f2c42005560d572413
parentf9dae0d3e63455206c1e1e169c76aca55aeb5d90
Merge branch 'maint'

* maint:
  Documentation/Makefile: fix interrupted builds of user-manual.xml