Merge branch 'maint-1.6.6' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2010 07:21:42 +0000 (23:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2010 07:21:42 +0000 (23:21 -0800)
commit64da6e20de1f2246e2d8d9d85e53ca3cbf393212
tree008639f6933b670039242a140a2ca659fd37bb37
parent8bb45b25b2230c84724f6f62bfcc04a79999a90c
parent97a449ee3031e8d128190b7f53a21c7688f73ec9
Merge branch 'maint-1.6.6' into maint

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