From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Jul 2013 19:46:54 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.4-rc0~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c4e4ec3ff053331c845331645a437b01b1f0de6;p=thirdparty%2Fgit.git

Merge branch 'maint'

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

8c4e4ec3ff053331c845331645a437b01b1f0de6