[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
Mon Jul 4 12:54:50 CEST 2011


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon Jul  4 12:41:33 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/util/AppKitXmlUtil.class.php
	app/modules/Cronks/config/cronks.xml

---







More information about the icinga-checkins mailing list