merge
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 13 Dec 2014 12:24:21 +0000 (13:24 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 13 Dec 2014 12:24:57 +0000 (13:24 +0100)
commitcf974dbe60699b2091ca04e7b0dd2affa1e88779
tree36f757a4f4ba31360300bfd627a499f6315088ca
parent1f0a755fd97850d4e8e4402f3bbd39f039a6a65d
merge

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
config/nagios-master.cfg