From 7bf0620eb5848cf0a13e4a3b6eee45f880d8dd01 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sun, 14 Jan 2018 08:15:59 +0000
Subject: [Automatic update for 2018-01-14]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Ie096b93a5c9476d763fb6677d0d9ab54c3c4744c
Reviewed-on: https://code.wireshark.org/review/25306
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 AUTHORS | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index 3f042edbf9..dd82396846 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4204,6 +4204,7 @@ John A. Thacker		<johnthacker[AT]gmail.com>
 John Keeping		<john[AT]metanate.com>
 John Miner		<optommp[AT]gmail.com>
 John Viklund		<john.viklund[AT]effnet.com>
+Jon DeVree		<nuxi[AT]vault24.org>
 Jonas Falkevik		<jonas.falkevik[AT]gmail.com>
 Jonathan Brucker	<jonathan.brucke[AT]gmail.com>
 Jonathan Muñoz		<jonathan.munoz[AT]inria.fr>
@@ -4472,6 +4473,7 @@ Wasim Abu Moch		<wasim[AT]mellanox.com>
 Weston Andros Adamson	<dros[AT]primarydata.com>
 Weston Schmidt		<weston_schmidt[AT]alumni.purdue.edu>
 Will Glynn		<will[AT]willglynn.com>
+Will Robertson		<aliask[AT]gmail.com>
 William Tu		<u9012063[AT]gmail.com>
 Xavier Brouckaert	<xabrouck[AT]cisco.com>
 Xiaochuan Sun		<linuxvxworks[AT]gmail.com>
-- 
cgit v1.2.3