Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:33:05 +0000 (14:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:33:05 +0000 (14:33 -0800)
* 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

1  2 
Makefile
diff --cc Makefile
Simple merge