Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Fri, 3 Jul 2009 18:08:43 +0000 (20:08 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 3 Jul 2009 18:08:43 +0000 (20:08 +0200)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  kaufmann runs rsyncd from xinetd


Trivial merge