[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
Thu Aug 11 08:38:13 CEST 2011


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 08:23:03 2011 +0200

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

Conflicts:
	app/modules/AppKit/config/autoload.xml
	app/modules/AppKit/lib/context/AppKitAgaviContext.class.php

---







More information about the icinga-checkins mailing list