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

git at icinga.org git at icinga.org
Mon Feb 6 16:34:48 CET 2012


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Feb  6 16:25:18 2012 +0100

Merge branch 'master' of git.icinga.org:icinga-web

Conflicts:
	app/modules/AppKit/lib/js/admin/RoleEditForm.js
	app/modules/AppKit/lib/js/admin/UserEditForm.js

---







More information about the icinga-checkins mailing list