diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-22 00:27:57 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-22 00:27:57 +0100 |
| commit | b2bfa32d253337a48f3bc0260982cbb945b345a3 (patch) | |
| tree | a75ae018b5c7608414bf50bd6e55683eb0c44f7a /AUTHORS | |
| parent | 99662b8dbf420d0112f83b7daddcecfb1bcb9bad (diff) | |
| parent | 2096ef47aad57a9988c8fdfaa46a70770a0e0b12 (diff) | |
| download | guix-b2bfa32d253337a48f3bc0260982cbb945b345a3.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu-system.am
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS index 6ec176cb9b..705a43128e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,8 +13,10 @@ alphabetical order): John Darrington <john@darrington.wattle.id.au> Andreas Enge <andreas@enge.fr> Guy Grant <gzg@riseup.net> + Raimon Grau <raimonster@gmail.com> Nikita Karetnikov <nikita@karetnikov.org> Aljosha Papsch <misc@rpapsch.de> + Manolis Ragkousis <manolis837@gmail.com> Cyril Roelandt <tipecaml@gmail.com> Alex Sassmannshausen <alex.sassmannshausen@gmail.com> Sree Harsha Totakura <sreeharsha@totakura.in> |