Where the same user had multiple entries, I mostly went with whichever entry had the most-recent non-merge commits. The order is alphabetical according to Emacs' sort-lines. Signed-off-by: W. Trevor King <wking@tremily.us>
