Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Wed, 23 Sep 2009 14:13:14 +0000 (16:13 +0200)
committerPeter Palfrader <peter@palfrader.org>
Wed, 23 Sep 2009 14:13:14 +0000 (16:13 +0200)
commitae5935934ad20b8132d349fc7ab316cfd71f53d3
tree66c7cdbcaeb3857f19ecbc2d7a3874e8c4dd7ae0
parent19d756542181f56e335f7c0b86a18ce4e1d12756
parent188b877bea20a60c6697fbbaf218977e647dc566
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  chopin has bootfs
  monitor reverse v6 zones
config/nagios-master.cfg