Manually merge latest updates.

diff --git a/AUTHORS b/AUTHORS
index 3f8a609..3ec4cdb 100644 (file)
--- 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