From 4aa8d58911615f4649ad8bf0c2d8b0e164f14583 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sun, 29 Jan 2017 08:10:45 -0800
Subject: [Automatic update for 2017-01-29]

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

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

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index 2d369ca677..7569de215f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3954,6 +3954,7 @@ Benoît Canet		<benoit[AT]scylladb.com>
 From git log
 ---------------
 Adam Goldman		<adam.goldman[AT]intel.com>
+Adam Mitz		<mitza[AT]ociweb.com>
 Adam Pridgen		<adam.pridgen[AT]thecoverofnight.com>
 Adam Schwalm		<adam.schwalm[AT]dynetics.com>
 Aditya Jain		<aditya.jain[AT]samsung.com>
@@ -4139,6 +4140,7 @@ John Miner		<optommp[AT]gmail.com>
 Jonas Falkevik		<jonas.falkevik[AT]gmail.com>
 Jonathan Brucker	<jonathan.brucke[AT]gmail.com>
 Jonathan Muñoz		<jonathan.munoz[AT]inria.fr>
+Jordan Keister		<grokspawn[AT]gmail.com>
 Jorge Power		<jpower[AT]rsscorp.org>
 Jose Rubio		<joserubiovidales[AT]gmail.com>
 Josef Baumgartner	<josef.baumgartner[AT]br-automation.com>
-- 
cgit v1.2.1