Merge branch 'dw/asciidoc-sources-are-dot-txt-files'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 May 2013 19:16:44 +0000 (17 12:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 May 2013 19:16:44 +0000 (17 12:16 -0700)
* dw/asciidoc-sources-are-dot-txt-files:
  CodingGuidelines: Documentation/*.txt are the sources


Trivial merge