]> granicus.if.org Git - icinga2/commit
Merge branch 'master' into mfriedrich/compatido
authorMichael Friedrich <michael.friedrich@gmail.com>
Tue, 25 Sep 2012 13:27:14 +0000 (15:27 +0200)
committerMichael Friedrich <michael.friedrich@gmail.com>
Tue, 25 Sep 2012 13:27:14 +0000 (15:27 +0200)
commitd0ed2a4840b67c203efea56e08990a0717c8fb76
treee68e205fbfb36b1b0c57e7382e046c76918f5ed9
parenta96a77c87c187bbb9439ae1235b563b58d08574d
parent0d779190575bcc69a2c48ecc19e24651735eb8c7
Merge branch 'master' into mfriedrich/compatido
icinga-app/config/icinga2.conf.dist