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

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

Commits:

8f6edb1 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  f9a4031   ams: fixed wrong offset calculation, adsstate has 2 bytes
    adds  8f6edb1   [Automatic update for 2015-05-31]


Summary of changes:
 epan/enterprise-numbers |  164 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   40 +++++++++++-
 manuf                   |   35 ++++++++++
 services                |    4 +-
 4 files changed, 229 insertions(+), 14 deletions(-)