]> granicus.if.org Git - icinga2/commitdiff
Merge branch 'master' of github.com:gunnarbeutner/strawberry
authorGunnar Beutner <gunnar.beutner@netways.de>
Thu, 14 Jun 2012 13:17:51 +0000 (15:17 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Thu, 14 Jun 2012 13:17:51 +0000 (15:17 +0200)
Conflicts:
components/checker/checkercomponent.cpp

1  2 
components/checker/checkercomponent.cpp
configure.ac

diff --cc configure.ac
Simple merge