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

git at icinga.org git at icinga.org
Thu Aug 11 17:36:02 CEST 2011


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 17:35:46 2011 +0200

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

Conflicts:
	app/modules/Api/lib/datastore/IcingaStoreTargetModifierModel.class.php

---







More information about the icinga-checkins mailing list