From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 13 Feb 2010 23:14:04 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc0~156
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7e94805db2a69e3fe6b9833fdaa6eb80de33959c

Merge branch 'maint'

* maint:
Start 1.7.0 maintenance track

Conflicts:
RelNotes
---

7e94805db2a69e3fe6b9833fdaa6eb80de33959c