Merge branch 'jc/core-checkstat' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:39:15 +0000 (3 15:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:39:15 +0000 (3 15:39 -0700)
* jc/core-checkstat:
  deprecate core.statinfo at Git 2.0 boundary

1  2 
config.c

diff --cc config.c
Simple merge