[icinga-checkins] icinga.org: icinga-web/mhein/default: * Merge fixes

[git at icinga.org]

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

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Apr  6 13:51:28 2010 +0200

* Merge fixes

---

 app/config/icinga.xml                              |   24 +-
 app/config/output_types.xml                        |   22 +
 etc/make/files.mk                                  | 1939 ++++++++++----------
 .../ext/AppKitExtStateProviderData.class.php       |   45 -
 4 files changed, 996 insertions(+), 1034 deletions(-)

Diff:   https://git.icinga.org/?p=icinga-web.git;a=commitdiff;h=226d01e41688a013bfa36b0f1e1474cfff806c18