Merge branch 'ah/doc-gitk-config'

* ah/doc-gitk-config: Documentation/gitk: document the location of the configulation file

Junio C Hamano committed Mar 28, 2014 at 13:51 UTC b2273d06033e5989ca30a72492ca894d0416354f

No changes.