aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2011-12-13 17:44:44 -0500
committerRuss Cox <rsc@golang.org>2011-12-13 17:44:44 -0500
commitf4b430c90a001fdca0dd3219f8c8d1e5203c1419 (patch)
treeefa336e668f8344939d4301eeb791008aca15158
parent2572803899485e6d07490ae04b1eb5aa5c758699 (diff)
downloadgo-f4b430c90a001fdca0dd3219f8c8d1e5203c1419.tar.gz
go-f4b430c90a001fdca0dd3219f8c8d1e5203c1419.zip
A+C: Florian Weimer (individual CLA)
R=golang-dev, gri CC=golang-dev https://golang.org/cl/5486056
-rw-r--r--AUTHORS1
-rw-r--r--CONTRIBUTORS1
2 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 0385f470c6..7a3fd655b3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -66,6 +66,7 @@ Fan Hongjian <fan.howard@gmail.com>
Fazlul Shahriar <fshahriar@gmail.com>
Firmansyah Adiputra <frm.adiputra@gmail.com>
Florian Uekermann <florian@uekermann-online.de>
+Florian Weimer <fw@deneb.enyo.de>
Gary Burd <gary@beagledreams.com>
Gideon Jan-Wessel Redelinghuys <gjredelinghuys@gmail.com>
Giles Lean <giles.lean@pobox.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 88c15093b7..4c791f9682 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -109,6 +109,7 @@ Fan Hongjian <fan.howard@gmail.com>
Fazlul Shahriar <fshahriar@gmail.com>
Firmansyah Adiputra <frm.adiputra@gmail.com>
Florian Uekermann <florian@uekermann-online.de> <f1@uekermann-online.de>
+Florian Weimer <fw@deneb.enyo.de>
Fumitoshi Ukai <ukai@google.com>
Gary Burd <gary@beagledreams.com> <gary.burd@gmail.com>
Gideon Jan-Wessel Redelinghuys <gjredelinghuys@gmail.com>