merge from HEAD

Richard Jones · Richard Jones · commit 3916eabb5f89 · 2004-05-13T00:21:31.000Z
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -6,6 +6,7 @@ Fixed:
 - anydbm sorting with None values (sf bug 952853)
 - roundup-server -g option not recognised (sf bug 952310)
 - HTML templating isset() inverted (sf bug 951779)
+- otks manager missing (sf bug 952931)
 
 
 2004-05-07 0.7.1
