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

git at icinga.org git at icinga.org
Mon Aug 22 15:19:44 CEST 2011


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 22 15:15:41 2011 +0200

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

Conflicts:
	app/modules/AppKit/models/LogParserModel.class.php

---







More information about the icinga-checkins mailing list