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

[git at icinga.org]

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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Nov 25 16:37:54 2011 +0100

Merge branch 'master' of ssh://git.icinga.org/icinga-web

---