aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS.txt
diff options
context:
space:
mode:
authorLaurent Ghigonis <laurent@p1sec.com>2013-06-05 01:59:20 +0200
committerLaurent Ghigonis <laurent@p1sec.com>2013-06-05 01:59:20 +0200
commitc219fcf2e915b1868f30cb67866c8494c39ae36b (patch)
treeb7ed2361d30da3e1346ad69b482bc7e46bc094a6 /AUTHORS.txt
parentMerge branch 'master' into traceroute (diff)
parentupdate email (diff)
downloadglouglou-c219fcf2e915b1868f30cb67866c8494c39ae36b.tar.xz
glouglou-c219fcf2e915b1868f30cb67866c8494c39ae36b.zip
Merge branch 'master' into traceroute
Diffstat (limited to 'AUTHORS.txt')
-rw-r--r--AUTHORS.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/AUTHORS.txt b/AUTHORS.txt
index b3e4756..1775839 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1 +1 @@
-2012, 2013 Laurent Ghigonis <laurent@p1sec.com>
+2012, 2013 Laurent Ghigonis <laurent@gouloum.fr>