Merge branch 'ow/config-mailmap-pathname' into maint

The "mailmap.file" configuration option did not support the tilde expansion (i.e. ~user/path and ~/path). * ow/config-mailmap-pathname: config: respect '~' and '~user' in mailmap.file

Junio C Hamano committed Jun 25, 2014 at 11:45 UTC fbfdf13b5c0f168bbb292454d8099ca49dd7dbd6

No changes.