From: Adam Langley <agl@golang.org>
Date: Fri, 21 Sep 2012 19:54:07 +0000 (+1000)
Subject: [release-branch.go1] A+C: Peter Armitage (individual CLA)
X-Git-Tag: go1.0.3~153
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=920cc5211e0c36cdbc48ef9636ede65b0f4102a3;p=gostls13.git

[release-branch.go1] A+C: Peter Armitage (individual CLA)

««« backport 0423072b54f2
A+C: Peter Armitage (individual CLA)

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/6392065

»»»
---

diff --git a/AUTHORS b/AUTHORS
index 6b535df4d6..5782614e84 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -176,6 +176,7 @@ Patrick Mylund Nielsen <patrick@patrickmn.com>
 Paul Lalonde <paul.a.lalonde@gmail.com>
 Paul Sbarra <Sbarra.Paul@gmail.com>
 Petar Maymounkov <petarm@gmail.com>
+Peter Armitage <peter.armitage@gmail.com>
 Peter Froehlich <peter.hans.froehlich@gmail.com>
 Peter Kleiweg <pkleiweg@xs4all.nl>
 Peter Mundy <go.peter.90@gmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c939720769..89f210b66e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -252,6 +252,7 @@ Paul Borman <borman@google.com>
 Paul Lalonde <paul.a.lalonde@gmail.com>
 Paul Sbarra <Sbarra.Paul@gmail.com>
 Petar Maymounkov <petarm@gmail.com>
+Peter Armitage <peter.armitage@gmail.com>
 Peter Froehlich <peter.hans.froehlich@gmail.com>
 Peter Kleiweg <pkleiweg@xs4all.nl>
 Peter McKenzie <petermck@google.com>