Phil Davis 3c2fff266f Merge branch 'master' into if-stats-widget-settings		2017-05-09 22:38:56 +05:45
..
cf/conf
conf.default	In a stock/default config.xml, show firewall rule descriptions in a column. Fixes #7323	2017-02-28 13:25:05 -05:00
etc	Merge pull request #3721 from aaa2ppp/patch-1	2017-05-09 13:43:54 -03:00
usr/local	Merge branch 'master' into if-stats-widget-settings	2017-05-09 22:38:56 +05:45