Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Mon, 21 Jun 2010 11:37:32 +0000 (13:37 +0200)
committerPeter Palfrader <peter@palfrader.org>
Mon, 21 Jun 2010 11:37:32 +0000 (13:37 +0200)
commit3b0d60b49e92da5f5c7e81d14a28fdd3544a0161
tree9f1fa10c8e5b7acb9cbee11e4c9b07b0a227aebe
parenta6f8de12850381d49bf7216314d2665bf3a13834
parent094257c138222260c0b235e1482ce78fde773f8c
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  fix typo
  add ulogd, acpid for heininen
  add heininen