[icinga-checkins] icinga.org: icinga-core/dev/ido: Merge branch 'dev/core' into mfriedrich/ core

[git at icinga.org]

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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Nov 27 11:53:16 2011 +0100

Merge branch 'dev/core' into mfriedrich/core

---