Merge 'maint' updates in
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2010 00:09:20 +0000 (17:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2010 00:09:31 +0000 (17:09 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1  2 
builtin/notes.c

diff --cc builtin/notes.c
Simple merge