Andrew's git / gitweb.git / diff
?
Merge branch 'ah/doc-gitk-config'
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Mar 2014 20:51:08 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Mar 2014 20:51:09 +0000 (13:51 -0700)
* ah/doc-gitk-config:
Documentation/gitk: document the location of the configulation file

Trivial merge