[icinga-checkins] icinga.org: icinga-core/master: Merge branch 'r1.5'

git at icinga.org git at icinga.org
Tue Aug 9 19:50:35 CEST 2011


Module: icinga-core
Branch: master
Commit: af1a236ed1adc5d7e13784301f4565191e345d61
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=af1a236ed1adc5d7e13784301f4565191e345d61

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Aug  9 18:10:24 2011 +0200

Merge branch 'r1.5'

Conflicts:
	html/main.html
	include/common.h
	module/idoutils/include/ido2db.h

---







More information about the icinga-checkins mailing list