Merge branch 'aw/rebase-i-p' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:23:25 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:23:25 +0000 (11:23 -0700)
* aw/rebase-i-p:
  rebase -i -p: include non-first-parent commits in todo list


Trivial merge