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

[git at icinga.org]

Module: icinga-web
Branch: mhein/default
Commit: 2fb3b754ceb8ee7f3b91398b2a38721569bc438f
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=2fb3b754ceb8ee7f3b91398b2a38721569bc438f

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jul 21 16:35:39 2010 +0200

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

Conflicts:
	etc/make/files.mk

* Finished new TO implementation

---