Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Tue, 14 Sep 2010 19:57:28 +0000 (21:57 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 14 Sep 2010 19:57:28 +0000 (21:57 +0200)
* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  rautavaara on squeeze


Trivial merge