From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 25 Jun 2010 11:15:56 +0000 (+0200)
Subject: Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=3d648bc054363ac6ee8d958208c4d05df7486a26;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:
  disable checking rsync, http ftp on kassia-sec
  kaufmann does iptables, thus ulogd
---

3d648bc054363ac6ee8d958208c4d05df7486a26