]> granicus.if.org Git - icinga2/commitdiff
Merge branch 'master' into mfriedrich/compatido
authorMichael Friedrich <michael.friedrich@gmail.com>
Tue, 25 Sep 2012 13:29:49 +0000 (15:29 +0200)
committerMichael Friedrich <michael.friedrich@gmail.com>
Tue, 25 Sep 2012 13:29:49 +0000 (15:29 +0200)

Trivial merge