aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-05-01 15:03:30 +0200
committerLudovic Courtès <ludo@gnu.org>2015-05-01 15:03:30 +0200
commitbf4af30bb2bce9dd5baf91f313ea35c55893eb10 (patch)
tree94aa42278cd88cb50304e7fe34854399fc5255af /AUTHORS
parent9e63a388d91f73e2b82f8c4688f131680fe5f165 (diff)
parentbc7d089a9cb5ce843730f863cc03195168a956b9 (diff)
downloadguix-bf4af30bb2bce9dd5baf91f313ea35c55893eb10.tar.gz
guix-bf4af30bb2bce9dd5baf91f313ea35c55893eb10.zip
Merge branch 'master' into core-updates
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index fa1835b707..e2dafe0b34 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,5 +35,6 @@ alphabetical order):
David Thompson <dthompson2@worcester.edu>
Paul van der Walt <paul@denknerd.org>
Mark H. Weaver <mhw@netris.org>
+ Christopher A. Webber <cwebber@dustycloud.org>
Andy Wingo <wingo@pobox.com>
Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>