Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Wed, 23 Mar 2011 09:55:00 +0000 (10:55 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 23 Mar 2011 09:55:00 +0000 (10:55 +0100)
commitd5062c1af3e096f4242de2a6e4bfc0e6389676c1
treedc403daf2fd112c036f12d02890e235170f4ed2b
parent1ae51fa76b53a23fd6d8184f19e601baf3874543
parent121e674e4b96a1579ad0600bbd29fc8f0d2d9490
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  ries has pg9
config/nagios-master.cfg