Merge branch 'maint-1.8.1' into maint
commit5e950c2199448d44388f7ca25c837fe7650da93c
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2013 21:34:07 +0000 (28 14:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2013 21:34:07 +0000 (28 14:34 -0700)
treea376b3c5e7e0dbb74fa3b92245ed93db7cc33160
parent9a82efd0d2a2727507bd908d7f0545437fcc0ff6
parent3322ad428446b2d54e95b50fc70abc1ece1f4069
Merge branch 'maint-1.8.1' into maint

* maint-1.8.1:
  git help config: s/insn/instruction/
Documentation/config.txt