From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 21 Jun 2010 11:37:32 +0000 (+0200)
Subject: Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3b0d60b49e92da5f5c7e81d14a28fdd3544a0161;p=mirror%2Fdsa-nagios.git

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
---

3b0d60b49e92da5f5c7e81d14a28fdd3544a0161