The branch, master has been updated
       via  e4679172e3f4307b14f0e1715dc33ca640dc038b (commit)
      from  be10e8eee6fa443244536fd76110b3863c505cca (commit)

- Log -----------------------------------------------------------------
commit e4679172e3f4307b14f0e1715dc33ca640dc038b
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>

    Sanitise additional .mailmap entries
    
    This sanitises multiple author addresses some more, mapping them back to one
    common entity.
---
 .mailmap |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/.mailmap b/.mailmap
index d834464..a7a401f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,6 +9,8 @@ Matthias Kilian         <[email protected]> kili <kili>
 Matthieu Herrb                 <[email protected]> matthieu <matthieu>
 Miod Vallat            <[email protected]> miod <miod>
 Nicholas Marriott      <[email protected]> nicm <nicm>
+Nicholas Marriott      <[email protected]> no_author <[email protected]>
+<[email protected]>     <[email protected]>
 Okan Demirmen          <[email protected]> okan <okan>
 Philip Guenther                <[email protected]> guenther <guenther>
 Pierre-Yves Ritschard  <[email protected]> pyr <pyr>
@@ -18,4 +20,5 @@ Stefan Sperling       <[email protected]> stsp <stsp>
 Stuart Henderson       <[email protected]> sthen <sthen>
 Ted Unangst            <[email protected]> tedu <tedu>
 Theo Deraadt           <[email protected]> deraadt <deraadt>
+Thomas Adam            <[email protected]> Thomas <[email protected]>
 William Yodlowsky      <[email protected]> william <william>


-----------------------------------------------------------------------

Summary of changes:
 .mailmap |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
tmux

------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_nov
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to