Merge branch 'maint'

* maint: t7500: fix flipped actual/expect lib-rebase: document exec_ in FAKE_LINES

Junio C Hamano committed Jul 1, 2013 at 12:46 UTC 8c4e4ec3ff053331c845331645a437b01b1f0de6

No changes.