]> granicus.if.org Git - icinga2/commitdiff
Merge branch 'master' of ssh://github.com/gunnarbeutner/strawberry
authorGunnar Beutner <gunnar.beutner@netways.de>
Mon, 21 May 2012 10:55:03 +0000 (12:55 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Mon, 21 May 2012 10:55:03 +0000 (12:55 +0200)

Trivial merge