[icinga-checkins] icinga.org: icinga-web/r1.5: Merge branch 'mfriedrich/default' of ssh://git .icinga.org/icinga-web into jmosshammer/default

git at icinga.org git at icinga.org
Fri Aug 26 16:28:47 CEST 2011


Module: icinga-web
Branch: r1.5
Commit: 6e20bd09f42e915dc6f5afab50674b748d85006c
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=6e20bd09f42e915dc6f5afab50674b748d85006c

Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 26 13:04:45 2011 +0200

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

Conflicts:
	app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php

---







More information about the icinga-checkins mailing list