Wato View Edit: Output the alias of a datasource instead of internal name
Changed condition in notify trap
FIX: f5_bigip_vserver: fix wrong OID (13 instead of 1)

Conflicts:
	ChangeLog
	checks/f5_bigip_vserver
FIX: f5_bigip_psu: handle more than first power supply

Conflicts:
	checks/f5_bigip_psu
viprinet_* checks: fix SNMP scan function
mk_postgres plugin: replace select * with list of explicit columns (fix for PG 9.1)
lnx_if: show MAC address for interfaces (needs also agent update)
Added mail_loop check to treasures
Merge branch 'master' of ssh://mathias-kettner.de/check_mk
FIX: Added state OPENING to hpux_multipath
Fixed typo in help text
FIX: ipmi_sensors: ignore sensors in state [NA] (not available)
Fixed notify_trap
new check winperf_tcp_conn
windows_agent: fixed timeouts for powershell scripts in local/plugins
winperf_tcp_conn: now with performance data and checkman
Merge branch 'master' of ssh://mathias-kettner.de/check_mk
Fix: webservice.py, making typecast in case content is a INT value
WATO: New rule for notification_options of hosts and services
Merge branch 'master' of ssh://mathias-kettner.de/check_mk