]> granicus.if.org Git - icinga2/commitdiff
Merge branch 'master' of git.icinga.org:icinga2
authorGunnar Beutner <gunnar.beutner@netways.de>
Fri, 28 Sep 2012 11:17:40 +0000 (13:17 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Fri, 28 Sep 2012 11:17:40 +0000 (13:17 +0200)

Trivial merge