merge from HEAD

Richard Jones · Richard Jones · commit c54432c2804b · 2005-02-14T05:51:14.000Z
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -24,6 +24,7 @@ Fixed:
 - removed rlog module (py 2.3 is minimum version now)
 - fixed class "help" listing paging (sf bug 1106329)
 - nicer error looking up values of None (response to sf bug 1108697)
+- fallback for (list) popups if javascript disabled (sf patch 1101626)
 
 
 2005-01-13 0.8.0b2
diff --git a/doc/index.txt b/doc/index.txt
@@ -130,6 +130,7 @@ Florian Schulze,
 Klamer Schutte,
 Dougal Scott,
 Stefan Seefeld,
+Jouni K Sepp�nen,
 Jeffrey P Shell,
 Joel Shprentz,
 Terrel Shumway,
