From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Dec 2008 09:18:34 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.2-rc0~205
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=373654ee0f568fdeab891c621d6a1ac6b0c15d3a;p=git.git

Merge branch 'maint'

* 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
---

373654ee0f568fdeab891c621d6a1ac6b0c15d3a