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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d117b5a2c4624bb9563dd66bb4c8c58fb13e4d4b
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

d117b5a by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic update for 2016-12-25]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: Ib5f9f3cb2d340075c38ec27bb0dfe7e0b7c65e6c
    Reviewed-on: https://code.wireshark.org/review/19430
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  e7287ca   Avoid recursive scan_local_interfaces operation
    adds  d117b5a   [Automatic update for 2016-12-25]


Summary of changes:
 epan/enterprise-numbers |  240 ++++++++++++++++++++++++++++++++++++++++++-----
 epan/sminmpec.c         |   59 +++++++++++-
 manuf                   |   64 ++++++++++++-
 services                |    2 +
 4 files changed, 335 insertions(+), 30 deletions(-)