Manually merged 471ad36afabf567676979759b63e853e8299e086 from master

diff --git a/README.txt b/README.txt
index 1ecf51bb0639c6cdcedbc7ed04910888cc63c1ae..4c31c7e36445d8209021f9ceab9e1cd50b798cdd 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -225,9 +225,9 @@ Niklas  Andersson
 Jonas   Hummelstrand    (jonas.hummelstrand@svt.se)\r
 Andreas Jeansson        (andreas.jeansson@svt.se)\r
 Peter   Karlsson        (peter.p.karlsson@svt.se)\r
+Jeff    Lafforgue\r
 Andy    Mace\r
 Robert         Nagy            (robert.nagy@dfindredpatch.se, ronag89@gmail.com)\r
 Helge   Norberg         (helge.norberg@svt.se)\r
 Thomas  R. Kaltz III\r
 Olle    Soprani\r
-Jeff    ?\r