fix merge mess
Merge branch 'master' of rcs.pfsense.org:pfsense/mainline
Conflicts: usr/local/www/diag_showbogons.php
Fix bogons update in GUI without duplicating logic
Only remove tmp file if we succeed
Add savemsg
Duplicate logic to download bogons data. For some reason the shell script is ignoring the first argument AND the file that was created to prevent it from sleeping. Life is too short to chase stupid stuff -- if you don't like it spend your own time to figure out the issue.
Icon for rules overview screen to indicate that advanced options are configured
Add sorting ability to status -> UPNP
Move Note below table so it does not interefere with table sorting
Unbreak dhcp lease sorting
View revisions
Also available in: Atom