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

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


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Jun  7 13:12:36 2011 +0200

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

Conflicts:
	tests/phpunit/TestInit.php

---







More information about the icinga-checkins mailing list