Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 17 Apr 2006 00:03:13 +0000 (17:03 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 17 Apr 2006 00:03:13 +0000 (17:03 -0700)
commit878bd08d9ad69cccec927488c4fb664a31af6592
tree641dfd0dea68af64535a07a9ed448fdc744d2863
parent6adfbe9b277ab86a1fadb3b0bcd23f1101b228d4
parent5bc4ce589646faf72c7a77a5d32d9496ccc8d456
Merge branch 'master' into next

* master:
  reading $GIT_DIR/info/graft - skip comments correctly.