Code

Merge branch 'maint-1.6.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 05:36:05 +0000 (22:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 05:36:05 +0000 (22:36 -0700)
commit763481787174adfcc247d6044bea330edcb2cc24
tree3acada7b9eb628e8ecb3df8a97edaa61aaf485e1
parentfd94836923708581ca3f9b5c42a6d600c2f631dc
parentf054a419419337142ffe40433aa3984ccc000624
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  Documentation: Remove an odd "instead"