Merge branch 'pr/1364'
commit8b2a2b1f4a4b0f41bc4f27b20bc7792913c65a54
authorHolger Weiss <holger@zedat.fu-berlin.de>
Sun, 4 Oct 2015 21:48:28 +0000 (4 23:48 +0200)
committerHolger Weiss <holger@zedat.fu-berlin.de>
Sun, 4 Oct 2015 21:48:28 +0000 (4 23:48 +0200)
tree145570847109e175355c56d05c15d7365a4a46ee
parentda3327fead59c4a67c6ff367a2e29e3f49e7e82e
parent883269416102e912d007f69f1e78bd090984b194
Merge branch 'pr/1364'

* pr/1364:
  check_ntp.pl: Droping this superseded plugin

Conflicts:
NEWS
plugins-scripts/check_ntp.pl
NEWS