summaryrefslogtreecommitdiffstats
path: root/THANKS.in
diff options
context:
space:
mode:
authorJan Wagner <waja@cyconet.org>2014-10-06 10:25:31 +0200
committerJan Wagner <waja@cyconet.org>2014-10-06 10:25:31 +0200
commit93071168df90cd71ecb0cd391923cb4cc7de8d3d (patch)
tree577dc81b76783b0b1bb885fe5a94b2af02818a9b /THANKS.in
parent4034419bebf1ff0b83596e109218d3682d23d874 (diff)
parent6100950329ff28ba52fa16b67539687efcb1ff08 (diff)
downloadmonitoring-plugins-93071168df90cd71ecb0cd391923cb4cc7de8d3d.tar.gz
Merge branch 'maint'
Conflicts: NEWS THANKS.in
Diffstat (limited to 'THANKS.in')
-rw-r--r--THANKS.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/THANKS.in b/THANKS.in
index 433698ca..75ecd56c 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -329,3 +329,5 @@ Patrick McAndrew
329Alexander Wittig 329Alexander Wittig
330Jason Benguerel 330Jason Benguerel
331Matthew Kent 331Matthew Kent
332Frederic Krueger
333Simon Meggle