[icinga-checkins] icinga.org: icinga-web/jmosshammer/default2: Merge branch 'jmosshammer/ default2' of git.icinga.org:icinga-web into mhein/statuscronk

[git at icinga.org]

Module: icinga-web
Branch: jmosshammer/default2
Commit: 7ea4699f8429e539c84e5bab4923223823b38599
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=7ea4699f8429e539c84e5bab4923223823b38599

Author: Marius Hein <mhein at ws-jmosshammer.(none)>
Date:   Mon Jun 21 15:38:00 2010 +0200

Merge branch 'jmosshammer/default2' of git.icinga.org:icinga-web into mhein/statuscronk

---