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

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

Commits:

ca0e3bf by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  884d49c   NBAP : Verify conversation proto data exists before trying to access it
    adds  ca0e3bf   [Automatic update for 2015-12-13]


Summary of changes:
 epan/enterprise-numbers |  312 +++++++++++++++++++++++++++++++++++++++++++++--
 epan/sminmpec.c         |   78 +++++++++++-
 manuf                   |   29 ++++-
 services                |    5 +-
 4 files changed, 411 insertions(+), 13 deletions(-)