Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Sat, 24 Oct 2009 14:09:09 +0000 (16:09 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sat, 24 Oct 2009 14:09:09 +0000 (16:09 +0200)
commitd808ff0f9f8d4cee0ff492258c2edcb2528f146a
treef06c199f10119981cd2fd91a1716dd57b867b073
parentdd853778deccc221b6d2e9246812f248e2145d9a
parent0682552fd0fbc95968b65f40ac9b96619120e0a7
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  penalosa seems to be smp
config/nagios-master.cfg