mailscanner - fix two typos in antivirus features select options
mailscanner - fix another typo on antivirus settings
Use correct function name
New beta packages: Zabbix-2 Agent and Zabbix-2 Proxy
Update OpenVPN Client Export again, rearrange options to make them more clear/easy to follow. Also bump version and promote package status to reflect how stable it has become.
Merge pull request #355 from dbaio/master

New beta packages: Zabbix-2 Agent and Zabbix-2 Proxy
fix typos
Reword inline config link for iOS since that same client also exists for Android with the same quirks. Provide a list of commonly used clients with download links at the bottom of the export page.
Prevent errors from missing files Reported-by: http://forum.pfsense.org/index.php/topic,51493.msg310252.html#msg310252
More checking for existence of file
Update config/squid-reverse/squid_monitor.php

Removed 30 line option from Max lines to be displayed.
Added 100 line option to Max. lines to be displayed.
Added 200 line option to Max. lines to be displayed.
Tested on i386 configuration.
Add checks to fix initial startup errors and include flowbits file in snort.conf
Merge pull request #357 from bmeeks8/master

Check to be sure file exists before reading and include flowbits rule file if missing in snort.conf
Adding Zabbix-2 Agent and Zabbix-2 Proxy to the amd64 repo
Merge pull request #358 from dbaio/master

Adding Zabbix-2 Agent and Zabbix-2 Proxy to the amd64 repo
Merge pull request #356 from jmkizer/master

Change in # of lines to display in squid logs.
Correct missing parametr
Fix Dansguardian build options