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

[git at icinga.org]

Module: icinga-web
Branch: cdoebler/default
Commit: 9b4fb0d435976fa39ed3aeece1f61aa7403adf2f
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=9b4fb0d435976fa39ed3aeece1f61aa7403adf2f

Author: Christian Doebler <christian.doebler at netways.de>
Date:   Tue Oct 13 09:52:20 2009 +0200

Merge branch 'master' into cdoebler/default

---