Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 5 Jan 2012 20:38:12 +0000 (21:38 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 5 Jan 2012 20:38:12 +0000 (21:38 +0100)
commitf992bf5f874b1cfa4b95e7b2fead04faec83ae66
tree23610d0abfd105cd98b70ba807d555963aa0ffee
parent0ea4246fcdb16d81adc07801ec196a7fa005a4ce
parentcf88310775db6ead6f958d0004f055e7b4e611b3
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  fix munin check for armhf
  mhy can haz armhf
config/nagios-master.cfg