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

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

Commits:

faf280a by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  ee2465e   GTK: fix a crash when switching a column to custom through 'Edit Column Details'
    adds  faf280a   [Automatic update for 2015-06-07]


Summary of changes:
 epan/enterprise-numbers |  192 ++++++++++++++++++++++++++++++++++++++++++++++-
 epan/sminmpec.c         |   49 +++++++++++-
 manuf                   |   30 ++++++++
 services                |    1 +
 4 files changed, 269 insertions(+), 3 deletions(-)