Merge branch 'sb/mailmap-freeing-NULL-is-ok'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Sep 2013 22:00:43 +0000 (15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Sep 2013 22:00:43 +0000 (15:00 -0700)
commite5229b6a61fefcacd63d11afd49f0cdafaa60801
treef4ada72f9054df19056a86bde7d3fcd7b5e668c5
parent0a3bc7d298408951630bbc6ac8e773659f900943
parentc9ba31f592ccf23dc2aa78a705a790341ea72cfd
Merge branch 'sb/mailmap-freeing-NULL-is-ok'

* sb/mailmap-freeing-NULL-is-ok:
  mailmap: remove redundant check for freeing memory
mailmap.c