Merge "fix: add .mailmap to fix commit information"
authorBenny Baumann <BenBE1987@gmx.net>
Mon, 13 Mar 2017 19:18:13 +0000 (20:18 +0100)
committerGerrit Code Review <gigi-system@dogcraft.de>
Mon, 13 Mar 2017 19:18:13 +0000 (20:18 +0100)

Trivial merge