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

[git at icinga.org]

Module: icinga-web
Branch: cdoebler/default
Commit: 6296c5bc59b8be1f275592b8cec39e7381b0490f
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=6296c5bc59b8be1f275592b8cec39e7381b0490f

Author: Christian Doebler <christian.doebler at netways.de>
Date:   Tue Oct 20 15:43:07 2009 +0200

Merge branch 'mhein/default' into cdoebler/default

Conflicts:
	app/modules/AppKit/templates/Widgets/ShowNavigationTop.php

---