about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-06 04:41:53 -0700
committerbors <bors@rust-lang.org>2014-06-06 04:41:53 -0700
commit566b7b93c6ca2c034f110fa670040de1a09195e4 (patch)
treea48a6c6d7dfcc33f45fc4c62df87aebcbc6d3540
parent76baa5f0864f7aedb5b0ec918f1ad465886904cb (diff)
parent95b2cce81f07412a3106fc1ec57fd6fe06ef9aa4 (diff)
downloadrust-566b7b93c6ca2c034f110fa670040de1a09195e4.tar.gz
rust-566b7b93c6ca2c034f110fa670040de1a09195e4.zip
auto merge of #14671 : aochagavia/rust/patch-1, r=alexcrichton
-rw-r--r--AUTHORS.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 910c928e913..c69cb06bd18 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -3,6 +3,7 @@ Rust was written by these fine people:
 Aaron Laursen <aaronlaursen@gmail.com>
 Aaron Todd <github@opprobrio.us>
 Adam Bozanich <adam.boz@gmail.com>
+Adolfo Ochagavía <aochagavia92@gmail.com>
 Adrien Tétar <adri-from-59@hotmail.fr>
 Alan Andrade <alan.andradec@gmail.com>
 Aleksander Balicki <balicki.aleksander@gmail.com>
@@ -25,7 +26,6 @@ Andrew Chin <achin@eminence32.net>
 Andrew Dunham <andrew@du.nham.ca>
 Andrew Paseltiner <apaseltiner@gmail.com>
 Anthony Juckel <ajuckel@gmail.com>
-aochagavia <aochagavia92@gmail.com>
 Arcterus <Arcterus@mail.com>
 Arkaitz Jimenez <arkaitzj@gmail.com>
 Armin Ronacher <armin.ronacher@active-4.com>