Merge branch 'yd/doc-is-in-asciidoc' into maint
commit432930bd337c5432851b644bec083086759a3070
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:40 +0000 (1 09:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:40 +0000 (1 09:19 -0700)
treea3d56ce451159355e0841b3a1d6508e54ef18632
parentab24e7521c1027f7d86722345422ec92a5dde659
parentbb9f2aecf0e212702cdb66e58b16e8e470e596cf
Merge branch 'yd/doc-is-in-asciidoc' into maint

* yd/doc-is-in-asciidoc:
  CodingGuidelines: our documents are in AsciiDoc