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

git at icinga.org git at icinga.org
Tue Jun 7 13:15:44 CEST 2011


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon May 30 10:12:35 2011 +0200

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

Conflicts:
	app/modules/AppKit/lib/module/AppKitModuleRoutingHandler.class.php
	app/modules/AppKit/lib/util/AppKitXmlUtil.class.php

---







More information about the icinga-checkins mailing list