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

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

Commits:

49610c5 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  65e5539   Generate Diameter's expert info's even when there's no tree so that they show up in the Expert Infos dialog.
    adds  49610c5   [Automatic update for 2015-08-23]


Summary of changes:
 epan/enterprise-numbers |  136 +++++++++++++++++++++++++++++++++++++++++++++--
 epan/sminmpec.c         |   36 ++++++++++++-
 services                |    1 +
 3 files changed, 167 insertions(+), 6 deletions(-)