Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Wed, 28 Jul 2010 20:54:37 +0000 (22:54 +0200)
committerPeter Palfrader <peter@palfrader.org>
Wed, 28 Jul 2010 20:54:37 +0000 (22:54 +0200)
commit3d40d591b1373e220f04787098305e2e79760f05
tree003845013737f542f5913d1faad2dc35260f79f7
parent4e82d350489985a2f500ae9968348d98c6ac0a85
parenta52f84987b94b456f319f0e11060f56b5ba6b84f
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  spontini is sparc
config/nagios-master.cfg