Merge branch 'maint'
commitd8355e5eaecddbcafdd66aa3d6433ae12f627177
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2013 21:34:55 +0000 (28 14:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2013 21:34:55 +0000 (28 14:34 -0700)
tree1a788d01a91203b999b9c751a6ab1ad0ee8b143a
parent8617715cc09b7422fe31189f9476f6ade73ede70
parent5e950c2199448d44388f7ca25c837fe7650da93c
Merge branch 'maint'

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