Code

Merge branch 'jc/maint-am-keep'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:35:07 +0000 (14:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:35:07 +0000 (14:35 -0800)
commit5e2f779cbf60997809130fde213736e1ea4f6f33
tree5d813dedae9d98c249538e9327c28b950d7fe163
parentb918eb6c2a949282a223bdb04ec8a524003f8c0c
parentc970a6fd0142da3740f0205f16f91d3f2ed7e258
Merge branch 'jc/maint-am-keep'
git-am.sh