]> granicus.if.org Git - icinga2/commitdiff
Merge branch 'master' of git.icinga.org:icinga2
authorMichael Friedrich <michael.friedrich@gmail.com>
Fri, 28 Sep 2012 08:37:58 +0000 (10:37 +0200)
committerMichael Friedrich <michael.friedrich@gmail.com>
Fri, 28 Sep 2012 08:37:58 +0000 (10:37 +0200)

Trivial merge