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

git at icinga.org git at icinga.org
Fri Jul 22 10:08:53 CEST 2011


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 22 10:08:33 2011 +0200

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

Conflicts:
	app/modules/AppKit/actions/Login/SilentAuthAction.class.php
	app/modules/AppKit/lib/context/AppKitAgaviContext.class.php
	app/modules/AppKit/lib/util/AppKitFileUtil.class.php
	app/modules/Cronks/config/cronks.xml
	app/modules/Web/lib/template/IcingaTemplateWorker.class.php

---







More information about the icinga-checkins mailing list