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

git at icinga.org git at icinga.org
Thu Jun 16 09:09:32 CEST 2011


Module: icinga-web
Branch: mhein/testing
Commit: 8074c0aa0c706d29ab115b100662d2a2eb289001
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=8074c0aa0c706d29ab115b100662d2a2eb289001

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 15 15:57:02 2011 +0200

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

Conflicts:
	app/config/config_handlers.xml
	app/modules/AppKit/config/autoload.xml
	app/modules/AppKit/lib/module/AppKitModuleUtil.class.php
	app/modules/TestDummy/config/module.xml
	tests/phpunit/tests/module/ModuleLoadingTest.php

---







More information about the icinga-checkins mailing list