summaryrefslogtreecommitdiff
path: root/AUTHORS.md
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-04-07 12:28:43 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-04-07 12:28:43 -0700
commit9b8444fff104b9776c7dc3a4019375680a283fdc (patch)
treeba2254fb081e2a7604f02f53721c575f7483a8f7 /AUTHORS.md
parent43e317f0b7745495e27d10521215a577e1630cd2 (diff)
parentc0262d8f76f0796671b16eac606e70bcb16da12c (diff)
downloadinfinitytier-9b8444fff104b9776c7dc3a4019375680a283fdc.tar.gz
infinitytier-9b8444fff104b9776c7dc3a4019375680a283fdc.zip
Merge of bignose/manual-pages (Linux man pages)
Diffstat (limited to 'AUTHORS.md')
-rw-r--r--AUTHORS.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/AUTHORS.md b/AUTHORS.md
index 23a7a10b..6b21f572 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -9,7 +9,7 @@
* Network Containers for Linux, iOS, Android<br>
Joseph Henry / joseph.henry@zerotier.com
-## Contributors
+## Third Party Contributors
* A number of fixes and improvements to the new controller, other stuff.<br>
Kees Bos / https://github.com/keesbos/
@@ -17,6 +17,9 @@
* Debugging and testing, OpenWRT support fixes.<br>
Moritz Warning / moritzwarning@web.de
+ * Debian GNU/Linux packaging, manual pages, and license compliance edits.<br>
+ Ben Finney <ben+zerotier@benfinney.id.au>
+
* Several others made smaller contributions, which GitHub tracks here:<br>
https://github.com/zerotier/ZeroTierOne/graphs/contributors/
@@ -28,7 +31,7 @@
* Home page: http://code.google.com/p/lz4/
* License grant: BSD attribution
- * http-parser by Joyent (many authors)
+ * http-parser by Joyent, Inc. (many authors)
* Files: ext/http-parser/*
* Home page: https://github.com/joyent/http-parser/