aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-03-30 10:25:30 -0400
committerJack Lloyd <[email protected]>2017-03-30 10:25:30 -0400
commit55181a9604bec2887b42590d3f60ddccbcb6c83d (patch)
tree5233f79ac5ed62784b84bcff2c533f618fd149ba
parent9124f6db6b22ea527f67238ee0bd41c9d20beef6 (diff)
parent0113615a0abc81811bb561e50f07fc3fbe2aded0 (diff)
Merge GH #950 Update authors
-rw-r--r--authors.txt1
-rw-r--r--doc/credits.rst6
2 files changed, 7 insertions, 0 deletions
diff --git a/authors.txt b/authors.txt
index 0a3d96a5f..437b68906 100644
--- a/authors.txt
+++ b/authors.txt
@@ -39,3 +39,4 @@ Christian Mainka (Hackmanit GmbH)
Kai Michaelis (Rohde & Schwarz Cybersecurity)
Philipp Weber (Rohde & Schwarz Cybersecurity)
Tobias @neverhub
+Alexander Bluhm (genua GmbH)
diff --git a/doc/credits.rst b/doc/credits.rst
index e13e38c85..014a486fb 100644
--- a/doc/credits.rst
+++ b/doc/credits.rst
@@ -10,6 +10,12 @@ snail-mail address (S), and Bitcoin address (B).
::
+ N: Alexander Bluhm
+ W: https://www.genua.de/
+ P: 1E3B BEA4 6C20 EA00 2FFC DE4D C5F4 83AD DEE8 6380
+ D: improve support for OpenBSD
+ S: Kirchheim, Germany
+
N: Charles Brockman
W: http://www.securitygenetics.com/
D: documentation editing