Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 24 Jul 2010 13:13:56 +0000 (15:13 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 24 Jul 2010 13:13:56 +0000 (15:13 +0200)
commitf060cd469b7ae31ae606acb249210a9399fdbefe
tree62f0d130d9969a87f95b733e631fdfe5ab0abed7
parent283693decf60d93f93691c92c41a194eea75aa4d
parent613399c86318513df151824248f7e3a6d8b66cc7
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

Conflicts:
dsa-nagios-checks/debian/changelog
dsa-nagios-checks/debian/changelog