Commit 7df49e9e5f5dc9017081b0647ffa54d5b09fb07a

Vicent Martí 2011-04-23T14:36:01

Merged pull request #139 from jpfender/merge-head-file. refs: Allow MERGE_HEAD in normalize_name()