[icinga-checkins] icinga.org: icinga-web/mhein/default: Merge branch 'cdoebler/default' into mhein/default

[Marius Hein]

Module: icinga-web
Branch: mhein/default
Commit: 4043be0d339c90d28aee0857381b2da7bdc90998
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=4043be0d339c90d28aee0857381b2da7bdc90998

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Oct  5 17:51:38 2009 +0200

Merge branch 'cdoebler/default' into mhein/default

---