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

[git at icinga.org]

Module: icinga-core
Branch: next
Commit: 9b25b90463bb6b21980b31cb1334285c8ef2d612
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=9b25b90463bb6b21980b31cb1334285c8ef2d612

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Fri Mar  8 22:33:09 2013 +0100

Merge branch 'test/core' into next

Conflicts:
	html/docs/de/index.html
	html/docs/en/index.html

---