tree 5c446d5c13797b117a34c309019e0131880fb1b1
parent 5634cf24766f8700804ca55f5e8567c88538a5b0
parent 5e835cac8622373724235d299f1331ac4cf81ccf
author Junio C Hamano <gitster@pobox.com> 1208671311 -0700
committer Junio C Hamano <gitster@pobox.com> 1208671311 -0700

Merge branch 'jc/maint-rebase-am' into maint

* jc/maint-rebase-am:
  rebase: do not munge commit log message

Conflicts:

	git-am.sh