Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Tue, 11 Aug 2009 10:25:55 +0000 (12:25 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 11 Aug 2009 10:25:55 +0000 (12:25 +0200)
commit1e8ddf89706b8afa4fd60eed434c4e3f36043ccf
treed471965c39fdfaad66fe3b638c2a58e0fca64692
parent506d841c0dee4545773b4c6937daaaea8302785f
parent09507a70ceb68af2721fd1bfa8f536bf860054a0
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  wolkenstein
config/nagios-master.cfg