Merge branch 'jg/cguide-we-cannot-count' into maint
commite8281f01642fe17d6f44b3b18ed333b322770e81
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2015 19:12:19 +0000 (21 12:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2015 19:12:19 +0000 (21 12:12 -0700)
tree89fbe25a6ad7bf93ee80a99c55e8bc95057f559b
parent2e0aabe602c08938520925e204028ae1f716ce98
parent6c3b2afe6f64d33c176a8d369793392d7659fd6f
Merge branch 'jg/cguide-we-cannot-count' into maint

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