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

Trivial merge