Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] master-2.6 3e276e9: .mailmap: fix duplicate entry

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 18 Nov 2018 19:29:40 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3e276e903faef14b9ba8bed3cce34087080ed66a
Submitter: "Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

3e276e9 by Vasil Velichkov (vvvelichkov@xxxxxxxxx):

    .mailmap: fix duplicate entry
    
    Change-Id: I4498178e0eae3cec45514cb11185e906edffa7c4
    Reviewed-on: https://code.wireshark.org/review/30694
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    (cherry picked from commit 2294ac3dfe3e3bb1fd74bfa5cd5523fd45b22c1c)
    Reviewed-on: https://code.wireshark.org/review/30698
    

Actions performed:

    from  2e58e04   LISP: Switch to proto_tree_add_subtree_format()
     add  3e276e9   .mailmap: fix duplicate entry


Summary of changes:
 .mailmap | 3 +++
 AUTHORS  | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)