Merge branch 'maint'
commitc6830a3b7ea043714966121e40f47d1077c681ac
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:52:01 +0000 (8 00:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:52:01 +0000 (8 00:52 -0800)
tree3d38b9ab77efbb95a9fbb4e79ada8aa6d30aec63
parentb7e7f6fb0005f861ca8aed80473a9809d646c403
parent7ff8b790bb6a0733177ab712cc7e4374a218f34b
Merge branch 'maint'

* maint:
  Merge accumulated fixes to prepare for 1.7.0.3

Conflicts:
RelNotes