From: J. Bruce Fields <redacted>
Date: Sun, 26 Aug 2007 14:36:38 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5071877d2c623ffc41b48bbb49908a61051a6228;p=git.git

Merge branch 'maint'

Conflicts:

	Documentation/user-manual.txt
---

5071877d2c623ffc41b48bbb49908a61051a6228