From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 10 Sep 2011 17:19:52 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=f5a16026789a5174bc61bb53915b7e55b48777db;p=mirror%2Fdsa-nagios.git

Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  vivaldi → squeeze
  argento → squeeze
  samhain on caballero is also broken
  merulo → squeeze
  caballero → squeeze
  arnold → squeeze
  rietz no longer has a /vicepa
  change to a different gw for csail
  berlioz does https
  agricola, abel → squeeze
  arcadelt → squeeze
  antheil → squeeze
---

f5a16026789a5174bc61bb53915b7e55b48777db