projects / mirror / dsa-nagios.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebad1aa 0723a8b)
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Mon, 21 Mar 2011 19:14:27 +0000 (20:14 +0100)
committerPeter Palfrader <peter@palfrader.org>
Mon, 21 Mar 2011 19:14:27 +0000 (20:14 +0100)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  franck going to squeeze

Conflicts:
config/nagios-master.cfg


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.