]> granicus.if.org Git - icinga2/commitdiff
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)
1  2 
icinga-app/config/icinga2.conf.dist

Simple merge