Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Mon, 20 Jul 2009 11:30:47 +0000 (13:30 +0200)
committerPeter Palfrader <peter@palfrader.org>
Mon, 20 Jul 2009 11:30:47 +0000 (13:30 +0200)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  Looks like verdi no longer has rsync

1  2 
config/nagios-master.cfg

Simple merge