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

[git at icinga.org]

Module: icinga-web
Branch: r1.5
Commit: 9a879ded8088f4fa72746ef91e41dcbf8e2e7335
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=9a879ded8088f4fa72746ef91e41dcbf8e2e7335

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 09:49:48 2011 +0200

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

---