From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 10 Mar 2012 19:50:40 +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=b9254b55e794a462e5b9f312842ade996be8edc9;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:
  add support for new trace file

Conflicts:
	dsa-nagios-checks/checks/dsa-check-udldap-freshness
---

b9254b55e794a462e5b9f312842ade996be8edc9