aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/change_log.txt4
-rw-r--r--markdown/__version__.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/change_log.txt b/docs/change_log.txt
index 7001d68..ad149ea 100644
--- a/docs/change_log.txt
+++ b/docs/change_log.txt
@@ -7,6 +7,10 @@ next_url: release-2.6.html
Python-Markdown Change Log
=========================
+Mar 8, 2015: Released version 2.6.1 (a bug-fix release). The (new)
+`yaml` option has been removed from the Meta-Data Extension as it was buggy
+(see [#390](https://github.com/waylan/Python-Markdown/issues/390)).
+
Feb 19, 2015: Released version 2.6 ([Notes](release-2.6.html)).
Nov 19, 2014: Released version 2.5.2 (a bug-fix release).
diff --git a/markdown/__version__.py b/markdown/__version__.py
index 0212a4d..bb66fc3 100644
--- a/markdown/__version__.py
+++ b/markdown/__version__.py
@@ -5,7 +5,7 @@
# (major, minor, micro, alpha/beta/rc/final, #)
# (1, 1, 2, 'alpha', 0) => "1.1.2.dev"
# (1, 2, 0, 'beta', 2) => "1.2b2"
-version_info = (2, 6, 0, 'final', 0)
+version_info = (2, 6, 1, 'final', 0)
def _get_version():