Updating mailmap

todb · todb · commit 522642a65d96 · 2013-04-09T15:34:51.000-05:00
diff --git a/.mailmap b/.mailmap
@@ -6,6 +6,7 @@ jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <juan.vazquez@metasploit.com>
 hmoore-r7 <hmoore-r7@github>       HD Moore <hd_moore@rapid7.com>
 hmoore-r7 <hmoore-r7@github>       HD Moore <hdm@digitaloffense.net>
 jlee-r7 <jlee-r7@github>           James Lee <egypt@metasploit.com> # aka egypt
+jlee-r7 <jlee-r7@github>           egypt <egypt@metasploit.com> # aka egypt
 jlee-r7 <jlee-r7@github>           James Lee <James_Lee@rapid7.com>
 dmaloney-r7 <dmaloney-r7@github>   David Maloney <DMaloney@rapid7.com> # aka TheLightCosine
 dmaloney-r7 <dmaloney-r7@github>   David Maloney <David_Maloney@rapid7.com>
@@ -49,6 +50,8 @@ mubix <mubix@github>                   Rob Fuller <jd.mubix@gmail.com>
 nmonkee <nmonkee@github>               nmonkee <dave@northern-monkee.co.uk> 
 rsmudge <rsmudge@github>               Raphael Mudge <rsmudge@gmail.com> # Aka `butane
 m-1-k-3 <m-1-k-3@github>               m-1-k-3 <michael.messner@integralis.com>
+m-1-k-3 <m-1-k-3@github>               m-1-k-3 <m1k3@s3cur1ty.de>
+m-1-k-3 <m-1-k-3@github>               m-1-k-3 <github@s3cur1ty.de>
 kost <kost@github>                     Vlatko Kosturjak <kost@linux.hr>
 ohdae <ohdae@github>                   ohdae <bindshell@live.com>
 schierlm <schierlm@github>             Michael Schierl <schierlm@gmx.de> # Aka mihi

-Original file line number
+Diff line change
 hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
 hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
 jlee-r7 <jlee-r7@github>           James Lee <[email protected]> # aka egypt
 +jlee-r7 <jlee-r7@github>           egypt <[email protected]> # aka egypt
 jlee-r7 <jlee-r7@github>           James Lee <[email protected]>
 dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]> # aka TheLightCosine
 dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]>
 nmonkee <nmonkee@github>               nmonkee <[email protected]>
 rsmudge <rsmudge@github>               Raphael Mudge <[email protected]> # Aka `butane
 m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
 +m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
 +m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
 kost <kost@github>                     Vlatko Kosturjak <[email protected]>
 ohdae <ohdae@github>                   ohdae <[email protected]>
 schierlm <schierlm@github>             Michael Schierl <[email protected]> # Aka mihi