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

git at icinga.org git at icinga.org
Fri May 21 14:55:23 CEST 2010


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

Author: jmosshammer <jmosshammer at ws-jmosshammer.(none)>
Date:   Fri May 21 14:54:52 2010 +0200

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

Conflicts:
	app/modules/AppKit/lib/database/models/generated/BaseNsmTarget.php
	app/modules/AppKit/lib/database/models/generated/BaseNsmUser.php
	app/modules/AppKit/lib/database/models/generated/BaseNsmUserPreference.php
	app/modules/Cronks/models/System/StaticContentModel.class.php
	app/modules/Web/config/autoload.xml

---







More information about the icinga-checkins mailing list