Merge branch 'sr/gfi-options' into jch
commit7ab0ad1a47b60a6a23bc3f4c59f7a5ddb2be998e
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 08:29:51 +0000 (4 01:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 08:29:51 +0000 (4 01:29 -0700)
treea3bad82a76de7c66c5458c4469577eef5897f0cc
parentdbc1b1f71052c084a84b5c395e1cb4b5ae526fcb
parent91d578a91f3c9d2371d3f6b988b57cc0653a19c9
Merge branch 'sr/gfi-options' into jch