summary refs log tree commit diff
path: root/THANKS
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-06-14 23:25:59 +0200
committerLudovic Courtès <ludo@gnu.org>2014-06-14 23:25:59 +0200
commit7470df5ddfa092872836b7e746ba8af50998b6aa (patch)
treea80014bd2ab00b0def1cca092f083feeb49d87ff /THANKS
parentd2e2f142268e32ea2d42990cddfc7df2136741f3 (diff)
parent07254feb24d755a01c63b64c1df1bfb68ac469bf (diff)
downloadguix-7470df5ddfa092872836b7e746ba8af50998b6aa.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'THANKS')
-rw-r--r--THANKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/THANKS b/THANKS
index 592bd44449..edfbbf6c09 100644
--- a/THANKS
+++ b/THANKS
@@ -7,6 +7,7 @@ suggestions, bug reports, patches, internationalization, or general
 infrastructure help:
 
        Lluís Batlle i Rossell <viric@viric.name>
+      Carlos Carleos <carleos@uniovi.es>
       Felipe Castro <fefcas@gmail.com>
       Daniel Clark <dclark@pobox.com>
    Alexandru Cojocaru <xojoc@gmx.com>