summaryrefslogtreecommitdiffstats
path: root/THANKS.in
diff options
context:
space:
mode:
authorGreg Cox <gcox@fibbsbozza.local>2014-07-29 18:52:12 -0400
committerGreg Cox <gcox@fibbsbozza.local>2014-07-29 18:52:12 -0400
commit4273dd06ff3e52094d6b267d00e8c51dd74de364 (patch)
tree425d127da5dbec7013999ed01b469fc3f72992d9 /THANKS.in
parentf05e7016320f4671fbf86cc5abc277efea20f79e (diff)
parent6f3d5825b203b75aef8d68bf0d117e7a1a4c0616 (diff)
downloadmonitoring-plugins-4273dd06ff3e52094d6b267d00e8c51dd74de364.tar.gz
Merge remote-tracking branch 'upstream/master'
Conflicts: plugins/netutils.c
Diffstat (limited to 'THANKS.in')
-rw-r--r--THANKS.in18
1 files changed, 18 insertions, 0 deletions
diff --git a/THANKS.in b/THANKS.in
index 06000513..b6dc2941 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -308,3 +308,21 @@ Luca Corti
308Jethro Carr 308Jethro Carr
309Evgeni Golov 309Evgeni Golov
310Oskar Liljeblad 310Oskar Liljeblad
311Andrew Widdersheim
312Anton Lofgren
313Damian Myerscough
314Davide Madrisan
315Gunnar Beutner
316Joseph Gooch
317Lars Vogdt
318Ricardo Maraschini
319Spenser Reinhardt
320Stephane Lapie
321Tilmann Bubeck
322Eric J. Mislivec
323Jean-Claude Computing
324Andy Brist
325Mikael Falkvidd
326Patric Wust
327Julius Kriukas
328Patrick McAndrew