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

[git at icinga.org]

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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Aug  1 03:00:02 2012 +0200

Merge branch 'next' into test/cgis

Conflicts:
	Changelog

---