Merge branch 'aw/rebase-i-p' into maint

* aw/rebase-i-p: rebase -i -p: include non-first-parent commits in todo list

Junio C Hamano committed Aug 16, 2011 at 11:23 UTC 824f4a93890b06d47d46f87b146022266977b2a9

No changes.