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

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

Commits:

4e00398 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  96d8e98   OSTIP: fix typo found by PVS Studio (V519)
    adds  4e00398   [Automatic update for 2015-12-06]


Summary of changes:
 epan/enterprise-numbers |   58 ++++++++++++++++++++++++++++++++++++++++++++-
 epan/sminmpec.c         |   14 +++++++++++
 manuf                   |   60 ++++++++++++++++++++++++++++++++++++++++++++---
 services                |    1 +
 4 files changed, 129 insertions(+), 4 deletions(-)