[icinga-checkins] icinga.org: icinga-core/dev/core: Merge branch 'next' into r1.7

[git at icinga.org]

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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Apr 26 15:12:13 2012 +0200

Merge branch 'next' into r1.7

---