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

[git at icinga.org]

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

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

Merge branch 'next' into r1.7

---