From 577bb7bf31abc9d01d81d3b49d4562b4bb4c871b Mon Sep 17 00:00:00 2001
From: Ian McInerney <Ian.S.McInerney@ieee.org>
Date: Wed, 15 Jan 2020 16:17:19 +0000
Subject: [PATCH] Update AUTHORS.txt with changes from master branch

Cherry-pick of:
8fcd59ebda9d5959f6db8f48ca9f7eecc5bd288f
037e6bc0061d10f25d14b8fa6d2978a21a967633
0857a1f5dcf8387a0863f1cbefe1db262986db00
07c6cfdc380640078b19749da5b862527abb1b88

Closes !64
---
 AUTHORS.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 0e0218d8c9..0069f2b17c 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -46,9 +46,10 @@ Russell Oliver <roliver8143[at]gmail-dot-com>
 Seth Hillbrand <hillbrand[at]ucdavis-dot-edu>
 Jeff Young <jeff[at]rokeby-dot-ie>
 Kevin Cozens <kevin[at]ve3syb-dot-ca>
+Ian McInerney <ian.s.mcinerney[at]ieee-dot-org>
 
-See git repo on launchpad for contributors at
-https://code.launchpad.net/~kicad-product-committers/kicad/+git/product-git/+ref/master.
+See git repo on GitLab for contributors at
+https://gitlab.com/kicad/code/kicad/-/graphs/master
 
 
 == Document Writers
@@ -75,6 +76,7 @@ Spanish (ES) Pedro Martin del Valle <pkicad[at]yahoo-dot-es>
 Spanish (ES) Iñigo Zuluaga <inigo_zuluaga[at]yahoo-dot-es>
 German (DE) Rafael Sokolowski <Rafael.Sokolowski[at]web-dot-de
 Japanese (JA) Kenta Yonekura <yoneken[at]kicad-dot-jp>
+Simplified Chinese (zh_CN) taotieren <admin[at]taotieren-dot-com>
 
 Remy Halvick, David Briscoe, Dominique Laigle, Paul Burke