From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 18 Jan 2010 12:08:06 +0000 (+0100)
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=884d5885900243d5a7aae6034c6ea0ef4f9eb112;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:
  they seem to have acpid
  grnet beginnings
---

884d5885900243d5a7aae6034c6ea0ef4f9eb112