Merge branch 'jg/cguide-we-cannot-count'
commit638cbf5f0f0dba7df1ad487e45638342c9afb6a0
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Apr 2015 16:55:29 +0000 (14 09:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Apr 2015 16:55:29 +0000 (14 09:55 -0700)
treef969fcf3337bcf4ddfe62eef34a9bff0b4938d56
parentecc46a1780eee9d4e5dd7aaa0e7d4c10365c7050
parent6c3b2afe6f64d33c176a8d369793392d7659fd6f
Merge branch 'jg/cguide-we-cannot-count'

* jg/cguide-we-cannot-count:
  CodingGuidelines: update 'rough' rule count
Documentation/CodingGuidelines