merge with trunk

1 files changed, 12 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 0367be1a..21d0f72c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -94,9 +94,20 @@ Release 1.0 (in development)
 * Added ``htmltitle`` block in layout template.
 
 
-Release 0.6.4 (in development)
+Release 0.6.5 (in development)
 ==============================
 
+* #321: Fix link generation in the LaTeX builder.
+
+
+Release 0.6.4 (Jan 12, 2010)
+============================
+
+* Improve the handling of non-Unicode strings in the configuration.
+
+* #316: Catch OSErrors occurring when calling graphviz with
+  arguments it doesn't understand.
+
 * Restore compatibility with Pygments >= 1.2.
 
 * #295: Fix escaping of hyperref targets in LaTeX output.