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

[git at icinga.org]

Module: icinga-web
Branch: master
Commit: 404e7f5a117a79e50f9f74864cb37579ae14d42e
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=404e7f5a117a79e50f9f74864cb37579ae14d42e

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Jan 17 14:34:05 2011 +0100

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

---