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

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

Commits:

df53b6f by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  0c296f0   Store the tree item to add to later (CID-1159152)
    adds  df53b6f   [Automatic update for 2016-06-12]


Summary of changes:
 epan/enterprise-numbers |   98 ++++++++++++++++++++++++++++-
 epan/sminmpec.c         |   24 +++++++
 manuf                   |  158 +++++++++++++++++++++++++++++------------------
 services                |    1 +
 4 files changed, 221 insertions(+), 60 deletions(-)