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

[git at icinga.org]

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

Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Nov 17 16:09:40 2011 +0100

Merge branch 'master' of git.icinga.org:icinga-web into mhein/default

---