Seth Mos 69be9601ac Merge remote branch 'upstream/master' ... Conflicts: etc/inc/vslb.inc etc/version		2011-05-13 13:43:37 +02:00
..
bin	Swap if statement, add fields into ipsecpinghosts file	2011-03-16 13:28:39 +01: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	Add GUI option to CARP settings for syncing certs. It was in the backend code but not the GUI. Fixes #1316	2011-03-02 08:57:58 -05: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
www	Merge remote branch 'upstream/master'	2011-05-13 13:43:37 +02:00