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

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

Commits:

7a801e1 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  960ac0b   DNS: Ignore Client Subnet option's data length when > 16
    adds  7a801e1   [Automatic update for 2015-11-15]


Summary of changes:
 epan/enterprise-numbers |   16 ++++++++++++++--
 epan/sminmpec.c         |    3 +++
 manuf                   |   26 +++++++++++++++++++++++---
 services                |    5 +++--
 4 files changed, 43 insertions(+), 7 deletions(-)