Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Mon, 18 Jan 2010 12:08:06 +0000 (13:08 +0100)
committerPeter Palfrader <peter@palfrader.org>
Mon, 18 Jan 2010 12:08:06 +0000 (13:08 +0100)
commit884d5885900243d5a7aae6034c6ea0ef4f9eb112
tree2be85595aca0d71f1285329ea28e93dd76ca33fe
parentb531aa78f1ba74fa23a530360f40d73f432c24ec
parentde40ba148dbc1c5fc5af3b863ffdad819de2afaa
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  they seem to have acpid
  grnet beginnings
config/nagios-master.cfg