From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Mon, 16 Dec 2013 20:48:12 +0000 (-0800)
Subject: A+C: Marko Tiikkaja (individual CLA)
X-Git-Tag: go1.3beta1~1218
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=54f39c997bb5824065cb17b605ba9dcff3094988;p=gostls13.git

A+C: Marko Tiikkaja (individual CLA)

Generated by addca.

R=gobot
CC=golang-dev
https://golang.org/cl/41940044
---

diff --git a/AUTHORS b/AUTHORS
index 6e7b309116..693b2ba2ec 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -215,6 +215,7 @@ Lucio De Re <lucio.dere@gmail.com>
 Luit van Drongelen <luitvd@gmail.com>
 Marco Hennings <marco.hennings@freiheit.com>
 Marko Juhani Silokunnas <marko.silokunnas@gmail.com>
+Marko Tiikkaja <marko@joh.to>
 Markus Duft <markus.duft@salomon.at>
 Markus Sonderegger <marraison@gmail.com>
 Martin Neubauer <m.ne@gmx.net>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 905cae1bd8..3ca5e90db3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -319,6 +319,7 @@ Marco Hennings <marco.hennings@freiheit.com>
 Mark Zavislak <zavislak@google.com>
 Marko Juhani Silokunnas <marko.silokunnas@gmail.com>
 Marko Mikulicic <mkm@google.com>
+Marko Tiikkaja <marko@joh.to>
 Markus Duft <markus.duft@salomon.at>
 Markus Sonderegger <marraison@gmail.com>
 Martin Neubauer <m.ne@gmx.net>