[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4523e8bf178dd6d48f4c4088ab82397021e20e72
Submitter: "Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>"
Changed: branch: master-2.4
Repository: wireshark

Commits:

4523e8b 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)
    (cherry picked from commit 065c9f26041ca5b3e46d233c8aef9df9dd6e997f)
    Reviewed-on: https://code.wireshark.org/review/30699
    

Actions performed:

    from  9e1f588   LISP: Switch to proto_tree_add_subtree_format()
     add  4523e8b   .mailmap: fix duplicate entry


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