jim-p e49d4564db Merge remote branch 'upstream/master' ... Conflicts: etc/inc/globals.inc etc/inc/upgrade_config.inc		2011-06-14 16:41:15 -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	Allow people to enter another user than admin for syncrhonizing in the carp settings page.	2011-06-14 13:40:17 +00:00
sbin	Reorder instructions and do not reload dns if its not allowed from the dns allow override setting.	2011-05-06 21:27:14 +00:00
share	Update serviceproviders.xml to a newer version	2010-09-29 11:00:53 -03:00
www	Merge remote branch 'upstream/master'	2011-06-14 16:41:15 -04:00