[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: 7f772e95927c055790aa33849314ca54b9a9ad04
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=7f772e95927c055790aa33849314ca54b9a9ad04

Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Nov 10 17:37:03 2011 +0100

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

---