projects / mirror / dsa-nagios.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cd1a0a 5c9e4d4)
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 28 Jul 2010 15:36:56 +0000 (17:36 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 28 Jul 2010 15:36:56 +0000 (17:36 +0200)
1  2 
config/nagios-master.cfg patch | diff1 | diff2 | blob | history

diff --cc config/nagios-master.cfg
Simple merge
Unnamed repository; edit this file 'description' to name the repository.