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

[git at icinga.org]

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

Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 26 15:49:40 2011 +0200

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

---