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

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

Commits:

fe0f0c8 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic manuf, services and enterprise-numbers update for 2015-03-08]
    
    Change-Id: Idbd00aa46cb41502f084623515e55160f54e22c6
    Reviewed-on: https://code.wireshark.org/review/7599
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  feef629   alljoyn: more robust signature handling
    adds  fe0f0c8   [Automatic manuf, services and enterprise-numbers update for 2015-03-08]


Summary of changes:
 epan/enterprise-numbers |  238 +++++++++++++++++++++++++++++++++++++++++++----
 epan/sminmpec.c         |   59 +++++++++++-
 manuf                   |   50 +++++++++-
 services                |    8 +-
 4 files changed, 331 insertions(+), 24 deletions(-)