[icinga-checkins] icinga.org: icinga-core/master: Merge branch 'fix/neb-unload-4033' into r1. 9

[git at icinga.org]

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

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Wed May 22 09:27:02 2013 +0200

Merge branch 'fix/neb-unload-4033' into r1.9

Conflicts:
	Changelog

---