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)
commitb554f951e73bd63ba8859035f5d4d53ef17463a2
tree0291e1e7ebacf22396e900b2aea858f992061e1e
parent7b55505b43fe011f320960027856bbcd7a663908
parent60f97cc78924f40cb568d754955e608f7d828768
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  kaufmann runs rsyncd from xinetd