How to merge author information.

Signed-off-by: Heikki Hokkanen <hoxu@users.sf.net>
Removed useless merge_authors configuration option. Use .mailmap instead.

Signed-off-by: Heikki Hokkanen <hoxu@users.sf.net>