summaryrefslogtreecommitdiff
path: root/ics-openvpn-stripped/main/openvpn/.mailmap
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-08-18 18:22:54 +0200
committerParménides GV <parmegv@sdf.org>2014-08-18 18:22:54 +0200
commit31f6eab32a26a658cbfb2db0d457cc1f87d23f0f (patch)
tree75f372ff22a94102ef2f9bd163febf54ac45e9d6 /ics-openvpn-stripped/main/openvpn/.mailmap
parent6057466bc8b4475bf4564b9143c60753c90f9aaa (diff)
parent7d8cde4f7ae769a3b6a25483d8bd0bb6c1551af9 (diff)
Merge branch 'develop'
Diffstat (limited to 'ics-openvpn-stripped/main/openvpn/.mailmap')
-rw-r--r--ics-openvpn-stripped/main/openvpn/.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/ics-openvpn-stripped/main/openvpn/.mailmap b/ics-openvpn-stripped/main/openvpn/.mailmap
new file mode 100644
index 00000000..91ff5537
--- /dev/null
+++ b/ics-openvpn-stripped/main/openvpn/.mailmap
@@ -0,0 +1 @@
+James Yonan <james@openvpn.net> james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>