Merge branch 'ow/config-mailmap-pathname' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:45:55 +0000 (11:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:45:55 +0000 (11:45 -0700)
commitfbfdf13...5c0f168bbb292454d8099ca49dd7dbd6
treeb3a6589...a8ba0d7b0ffdc640999136b7bc282574copy hash to clipboard (tree)
parentad5d893...078a50c247e259cdc1b6d615b233bf47copy hash to clipboard (diff)
parent9352fd5...0876ea0faf9f12251ecea06954fbe59bcopy hash to clipboard (diff)
config.c