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

[git at icinga.org]

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

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Jul 20 17:59:17 2010 +0200

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

---