Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Tue, 3 Nov 2009 09:47:41 +0000 (10:47 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 3 Nov 2009 09:47:41 +0000 (10:47 +0100)
commitb7d928452422b9108b8b6bf9800d4f94cab9917b
treee382d198c7e3399739a61e30c0fe0eec3622aeff
parent10ebfcc4608f12f557e860adff039624cbb26c44
parent5f61ad8ff7c0ada98030e265f4fdf1a497f03454
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  byrd now in heavy-exim
config/nagios-master.cfg