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

[git at icinga.org]

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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 17:30:16 2011 +0200

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

---