Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Thu, 14 May 2009 10:01:37 +0000 (12:01 +0200)
committerPeter Palfrader <peter@palfrader.org>
Thu, 14 May 2009 10:01:37 +0000 (12:01 +0200)
commit3716f1cbe2f19dc06607d0a05e7a035bc1ae12fb
treea0b807d95f80555f26d15c680ccada95b8eedfa1
parent752c6888c2fc4676eac17c998dac3e4880833db6
parentafc3d426f4abe3d86064993d01eeeec7cf7a2af6
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  penalosa runs an SMP kernel again
config/nagios-master.cfg