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)
commit1787be181612412fa0e39a2fe61d72c0ba9dbc55
treebaf5b9d980768abcf6ee86296fd94b71ba32067b
parentf79acba81afea4a50183dd6754d7aeb064e0e4e1
parenta3af6962dd5bad3a4fd886d59678c7c63e87ffcf
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  rautavaara on squeeze