From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 9 Nov 2009 21:58:32 +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;ds=sidebyside;h=e04c1899083df9b3ca97ae5b3e02830f16ea5307;hp=e04c1899083df9b3ca97ae5b3e02830f16ea5307;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:
  duarte has one cpu for now
---