Merge branch 'ch/am-header' into jch
commitcaf090023908370a8bacc9376fe0c13f721e03d1
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 08:29:52 +0000 (4 01:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 08:29:52 +0000 (4 01:29 -0700)
tree354fa87583ba1fc287bd0ea9e61f29f35de5a370
parentb47d78addbf6b1a1bcced17bc8aec5365b2e724b
parentfa9d3485ead15387fd76a35284bd3ffb32d7c6c7
Merge branch 'ch/am-header' into jch