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

[git at icinga.org]

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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Nov 10 16:07:46 2011 +0100

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

Conflicts:
	app/modules/Cronks/config/javascript.xml
	app/modules/Cronks/lib/js/Cronks/Tackle/Cronk.js

---