[icinga-checkins] icinga.org: icinga-core/rbartels/html-cleanup: Merge branch 'rbartels/cgi' into rbartels/html-cleanup

[git at icinga.org]

Module: icinga-core
Branch: rbartels/html-cleanup
Commit: 539b6d69b3545cbbd58b9a428f282c1bfcdde2be
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=539b6d69b3545cbbd58b9a428f282c1bfcdde2be

Author: Ricardo Bartels <ricardo at bitchbrothers.com>
Date:   Sat Mar 16 18:14:28 2013 +0100

Merge branch 'rbartels/cgi' into rbartels/html-cleanup

Conflicts:
	cgi/extinfo.c
	cgi/status.c

---