able to handle equal comment ids in host and service
FIX: Fix hiliting of errors in Nagios output
jolokia_metrics.mem: now able to handle negative/missing max heap values
Merge branch 'master' of ssh://mathias-kettner.de/check_mk
Fix two problems in flexible notifications

1. Notification filters from second channel used settings from first.
2. Do not defer notifictations out of the period
3. Correctly return deferred-flag
Merge branch 'master' of ssh://mathias-kettner.de/check_mk
FIX: tcp_conn_stats: use /proc/net/tcp instead of netstat -tn
WATO: new mode ineffective_rules
move changelog entry
resolved merge conflict
resolve merge conflict
wmic_processs: cpucores now being considered when calculating user/kernel percentages
New filter for IP address of a host
Merge branch 'master' of ssh://mathias-kettner.de/check_mk
Quicksearch: search for IP addresses
FIX: Avoid duplicate "Services" button in host detail views
Fixed ChangeLog
mem.include: Linux memory check now includes size of page tables.
FIX: fixed crash on host notification when contact had explicit services set
Fix PNP template for memory usage