From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 26 Dec 2009 22:33:05 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.0-rc0~139
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1d85dd6fb2d5a05493dd11c6fb77ef2c04c79f43;p=git.git

Merge branch 'maint'

* maint:
  Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV
  Start 1.6.6.X maintenance track
  Add git-http-backend to command-list.
  t4019 "grep" portability fix
  t1200: work around a bug in some implementations of "find"

Conflicts:
	RelNotes
---

1d85dd6fb2d5a05493dd11c6fb77ef2c04c79f43