From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 12 Jun 2009 14:43:50 +0000 (+0000)
Subject: Manually merge latest updates.
X-Git-Tag: v_3_0_13~7
X-Git-Url: http://www.privoxy.org/gitweb/?a=commitdiff_plain;h=8d812373515c17b0f81bc912e82289df8399a65f;p=privoxy.git

Manually merge latest updates.
---

diff --git a/AUTHORS b/AUTHORS
index 3f8a6097..3ec4cdb5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,7 +11,6 @@ Current Privoxy Team:
  Gerry Murphy
  Lee Rian
  Roland Rosenfeld
- Jörg Strohmayer
 
 Former Privoxy Team Members:
 
@@ -32,6 +31,7 @@ Former Privoxy Team Members:
  Haroon Rafique
  Georg Sauthoff
  Thomas Steudten
+ Jörg Strohmayer
  Rodney Stromlund
  Sviatoslav Sviridov
  Sarantis Paskalis
@@ -78,6 +78,7 @@ alphabetical order):
  Raphael Moll
  Amuro Namie
  Adam Piggott
+ Petr Písar
  Dan Price
  Roberto Ragusa
  Félix Rauch