From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 21 Mar 2011 19:14:27 +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=adb6cfe3e5db6f3b20ec157d276604cd629811ab;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:
  franck going to squeeze

Conflicts:
	config/nagios-master.cfg
---

adb6cfe3e5db6f3b20ec157d276604cd629811ab