Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Sat, 10 Mar 2012 19:50:40 +0000 (20:50 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sat, 10 Mar 2012 19:50:40 +0000 (20:50 +0100)
commitb9254b55e794a462e5b9f312842ade996be8edc9
tree34c0a10b16cfa5c52d6eb9e78bbd57f80966eb1a
parentd60bb1ea06cfcf45477313e0027707baab620a62
parent3c1a48ca93175059f703b6b3dc7e5bebf981d029
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