Seth Mos 126f531437 Merge remote branch 'upstream/master' ... Conflicts: etc/inc/rrd.inc usr/local/www/interfaces.php		2011-03-24 08:42:00 +01:00
..
bin	Swap if statement, add fields into ipsecpinghosts file	2011-03-16 13:28:39 +01:00
captiveportal	ipfw is not referenced here.	2011-03-15 12:53:36 +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	fix text (remove entirely, comment is related to an open feature request). ticket #1262	2011-02-08 00:40:39 -05:00
share	Update serviceproviders.xml to a newer version	2010-09-29 11:00:53 -03:00
www	Merge remote branch 'upstream/master'	2011-03-24 08:42:00 +01:00