Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2010 07:21:50 +0000 (23:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2010 07:21:50 +0000 (23:21 -0800)
commitf7311dc2293d9c52827c518933c80bd664023e97
tree5516438f829cf0f0a60a22667f7f142843f058a6
parent3fdcdbdf301dadb7af58fe038501f0af6419a2e0
parent64da6e20de1f2246e2d8d9d85e53ca3cbf393212
Merge branch 'maint'

* maint:
  t3301-notes: insert a shbang line in ./fake_editor.sh