[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: Merge branch 'mbrooks/core' into test/core

[git at icinga.org]

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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Jul 24 22:40:01 2011 +0200

Merge branch 'mbrooks/core' into test/core

---