]> granicus.if.org Git - icinga2/commitdiff
Merge branch 'master' into compatido
authorMichael Friedrich <michael.friedrich@gmail.com>
Sat, 15 Sep 2012 11:23:51 +0000 (13:23 +0200)
committerMichael Friedrich <michael.friedrich@gmail.com>
Sat, 15 Sep 2012 11:23:51 +0000 (13:23 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge