]> jfr.im git - irc/atheme/atheme.git/commitdiff
Add Shockk to mailmap file
authorShockk <redacted>
Fri, 16 Jan 2015 07:18:39 +0000 (07:18 +0000)
committerShockk <redacted>
Fri, 16 Jan 2015 07:18:39 +0000 (07:18 +0000)
.mailmap

index 0c3e39528bc5724775faaa76315c23f66f4b1f7b..837f462345a2e1f884bc239f5bfdfa483518d437 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,7 @@ Chris Fuenty <zimmy@zimmy.co.uk> <zimmaster@cia.com>
 Chris Fuenty <zimmy@zimmy.co.uk> <zimmy@atheme.org>
 Craig Edwards <craigedwards@brainbox.cc> brain <devnull@localhost>
 Daniel Vassdal <shutter@canternet.org> Daniel Vassdal <daniel@daniel-VirtualBox.(none)>
+David Farrell <shokku.ra@gmail.com> Shockk <shokku.ra@gmail.com>
 Diane Bruce <db@db.net> db <devnull@localhost>
 Douglas Freed <dwfreed@mtu.edu> dwfreed <dwfreed@mtu.edu>
 Elfyn McBratney <elfyn.mcbratney@gmail.com> beu <devnull@localhost>