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

[git at icinga.org]

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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Jun 12 17:55:10 2012 +0200

Merge branch 'mfriedrich/ido' into mfriedrich/core

Conflicts:
	Changelog

---