[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: c3e290846d1a3aebcf72cfdaec95f146c9d01f1b
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=c3e290846d1a3aebcf72cfdaec95f146c9d01f1b

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun May  6 13:49:38 2012 +0200

Merge branch 'next' into r1.7

---