From: Andrew Gerrand <adg@golang.org>
Date: Thu, 13 Feb 2014 04:29:10 +0000 (+1100)
Subject: A+C: Marc Weistroff (individual CLA)
X-Git-Tag: go1.3beta1~740
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7e2e384890af235e1d0f67d62931b221ad80306d;p=gostls13.git

A+C: Marc Weistroff (individual CLA)

Generated by addca.

R=gobot
CC=golang-codereviews
https://golang.org/cl/62870043
---

diff --git a/AUTHORS b/AUTHORS
index 97e7e733e9..3c12fcec3a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -233,6 +233,7 @@ Luca Greco <luca.greco@alcacoop.it>
 Lucio De Re <lucio.dere@gmail.com>
 Luit van Drongelen <luitvd@gmail.com>
 Luke Curley <qpingu@gmail.com>
+Marc Weistroff <marc@weistroff.net>
 Marco Hennings <marco.hennings@freiheit.com>
 Marko Juhani Silokunnas <marko.silokunnas@gmail.com>
 Marko Tiikkaja <marko@joh.to>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 62f1a227b3..c9aee3c284 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -334,6 +334,7 @@ Luit van Drongelen <luitvd@gmail.com>
 Luke Curley <qpingu@gmail.com>
 Luuk van Dijk <lvd@golang.org> <lvd@google.com>
 Manu Garg <manugarg@google.com>
+Marc Weistroff <marc@weistroff.net>
 Marcel van Lohuizen <mpvl@golang.org>
 Marco Hennings <marco.hennings@freiheit.com>
 Mark Zavislak <zavislak@google.com>