Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Dec 2008 09:18:34 +0000 (01:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Dec 2008 09:18:34 +0000 (01:18 -0800)
* maint:
Prepare for v1.6.1.1 maintenance release
Documentation/diff-options.txt: unify options
gitweb: Fix export check in git_get_projects_list

Conflicts:
RelNotes

Trivial merge