Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Mar 2010 02:30:37 +0000 (19:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Mar 2010 02:30:37 +0000 (19:30 -0700)
* maint:
  Documentation/git-read-tree: clarify 2-tree merge
  Documentation/git-read-tree: fix table layout


Trivial merge