jim-p 8b6313a4d3 Merge remote-tracking branch 'upstream/master' ... Conflicts: etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/interfaces.inc etc/inc/services.inc etc/inc/xmlrpc_client.inc usr/local/www/fbegin.inc usr/local/www/services_dhcp.php		2011-07-12 19:57:42 -04:00
..
bin	Merge remote branch 'upstream/master'	2011-05-19 08:50:48 -04:00
captiveportal	Use the availble constant on php for this and also the right value that comes with it since PHP never supported u_int. There is a bug open still on PHP about bcmod but some more info is needed.	2011-05-06 20:36:05 +00:00
pkg	Remove obsolete file lurking on installs.	2011-06-15 14:04:03 +00:00
sbin	Put a netmask of /32 to all parameters of -k/-K/-b of pfctl to avoid any issues.	2011-07-11 21:05:35 +00:00
share	Update serviceproviders.xml to a newer version	2010-09-29 11:00:53 -03:00
www	Merge remote-tracking branch 'upstream/master'	2011-07-12 19:57:42 -04:00