From: Martin Zobel-Helas <zobel@debian.org>
Date: Thu, 17 Mar 2011 22:24:42 +0000 (+0100)
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=3c2898e4a4f5477c158a1f2eb6693e54de1361f8;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:
  dijkstra on squeeze
  merikanto is on squeeze
  beethoven and murphy on squeeze
  kaufmann on squeeze
  wieck on squeeze
  geo1 on squeeze
  unger on squeeze
  rietz on squeeze
---

3c2898e4a4f5477c158a1f2eb6693e54de1361f8