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

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

Commits:

8f04763 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  7adf696   IPv6: Fix RPL routing header computed address count if ip6r_len == 0
    adds  8f04763   [Automatic update for 2015-11-29]


Summary of changes:
 epan/enterprise-numbers |  514 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |  127 +++++++++++-
 manuf                   |  151 +++++++++++---
 services                |    7 +-
 4 files changed, 737 insertions(+), 62 deletions(-)