merge with 0.6

This commit is contained in:
Georg Brandl
2010-01-02 00:49:51 +01:00
11 changed files with 66 additions and 8 deletions

View File

@@ -49,6 +49,10 @@ Release 1.0 (in development)
Release 0.6.4 (in development)
==============================
* #293: line blocks are styled properly in HTML output.
* #285: make the ``locale_dirs`` config value work again.
* #303: ``html_context`` values given on the command line via ``-A``
should not override other values given in conf.py.