Robert Hencke authored 6 years ago and Timo Teräs committed 6 years ago

Consolidate author information, so that tools like 'git shortlog' show
a single entry for each author.