[icinga-checkins] icinga.org: icinga-core/mfriedrich/cgis: Merge branch 'test/cgis' into r1.5

[git at icinga.org]

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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jul 29 17:22:13 2011 +0200

Merge branch 'test/cgis' into r1.5

Conflicts:
	Changelog

---