From ef20188bf6b7170cef5f0d0b86f929f74e852dc4 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sun, 19 Feb 2017 08:12:05 -0800
Subject: [Automatic update for 2017-02-19]

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

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

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index 644bd98c89..fc954962ce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4141,6 +4141,7 @@ Joakim Karlsson		<oakimk[AT]gmail.com>
 Johan Wahl		<johan.wahl[AT]ericsson.com>
 John A. Thacker		<johnthacker[AT]gmail.com>
 John Miner		<optommp[AT]gmail.com>
+John Viklund		<john.viklund[AT]effnet.com>
 Jonas Falkevik		<jonas.falkevik[AT]gmail.com>
 Jonathan Brucker	<jonathan.brucke[AT]gmail.com>
 Jonathan Muñoz		<jonathan.munoz[AT]inria.fr>
@@ -4186,6 +4187,7 @@ Marcel Essig		<marcel.essig[AT]gmx.de>
 Marian Ďurkovič		<md[AT]bts.sk>
 Marius			<mareko.paliga[AT]gmail.com>
 Mark Cunningham		<launchpad[AT]markcunningham.ie>
+Mark Phillips		<mark.phil[AT]samsung.com>
 Mark Weel		<markweel[AT]hotmail.com>
 MarkPhillips		<mark.s.phillips[AT]outlook.com>
 Marko Hrastovec		<marko.hrastovec[AT]gmail.com>
-- 
cgit v1.2.1