From: Fabian Keil <fk@fabiankeil.de>
Date: Thu, 11 Sep 2008 17:08:02 +0000 (+0000)
Subject: - Remove a misleading paragraph.
X-Git-Tag: v_3_0_11~248
X-Git-Url: http://www.privoxy.org/gitweb/filter-file.html?a=commitdiff_plain;h=c158c4e4164225dbe8f02a856a4936297307f9d8;p=privoxy.git

- Remove a misleading paragraph.
- Remove vi marker as this is a plain text file.
---

diff --git a/ChangeLog b/ChangeLog
index dfe69925..de3e0fb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 ChangeLog for Privoxy
 --------------------------------------------------------------------
 *** Since 3.0.10
-	
+
 - Support for remote toggling is controlled by the configure
   option --disable-toggle only. In previous versions it also
   depended on the action editor and thus configuring with the
@@ -633,12 +633,3 @@ Copyright   :  Written by and Copyright (C) 2001-2008 the SourceForge
                http://www.gnu.org/copyleft/gpl.html
                or write to the Free Software Foundation, Inc., 59
                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-               Note that parts of Privoxy are under licenses that are
-               GPL-compatible but less restrictive - for details see
-               Privoxy's source code. The Privoxy team doesn't hold the
-               copyright for these parts and doesn't relicense them either.
-               You are free to extract them again to distribute them under
-               their own license.
-	
-set vi:tw=68