Scott Ullrich 6f5b2ff555 Merge remote branch 'upstream/master'		2011-02-28 13:28:42 -05:00
..
bin	at least don't touch rrd here, that rrd won't exist anyway	2011-02-06 00:13:55 -05:00
captiveportal	Move all functions from index.php for captiveportal.inc	2011-02-22 16:27:15 -03:00
pkg	fix text	2011-01-05 01:19:24 -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-02-28 13:28:42 -05:00