Merge branch 'jn/conf'
commit86183fbb09ffe5d46eae1cf52023a1b5f8fbc047
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:23:09 +0000 (12 19:23 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:23:09 +0000 (12 19:23 -0700)
treec3e94766b5baa12f84020efe130291275ee01aef
parentcd5fff64e6014f9c1d4c2bc113fde19bd45d2db7
parenta20b4d899ae75e075641d7bfe9462a239c8b9236
Merge branch 'jn/conf'
Makefile