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

git at icinga.org git at icinga.org
Wed Apr 11 14:26:29 CEST 2012


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Apr 11 14:23:52 2012 +0200

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

Conflicts:
	app/modules/Api/config/autoload.xml

---







More information about the icinga-checkins mailing list