From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 27 Mar 2010 15:25:25 +0000 (+0100)
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=8bb0420d088d6bee060724e44b68abe2cf47722f;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:
  grieg has postgres
  corelli has ulogd
  add corelli
---

8bb0420d088d6bee060724e44b68abe2cf47722f