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

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

Commits:

6deac90 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  0180c29   ISAKMP: fix # of SPIs field name in Delete payload
    adds  6deac90   [Automatic update for 2016-08-28]


Summary of changes:
 AUTHORS                 |    1 +
 epan/enterprise-numbers |  250 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   63 +++++++++++-
 manuf                   |  136 +++++++++++++++++++++++---
 services                |    4 +-
 5 files changed, 419 insertions(+), 35 deletions(-)