aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Takhteyev <yuri@freewisdom.org>2008-08-20 22:42:39 -0700
committerYuri Takhteyev <yuri@freewisdom.org>2008-08-20 22:42:39 -0700
commit75f33d6da5a5c59151f7779634f7efe0fef4d746 (patch)
tree50fbda0988b10855817e16f0aacd4eda4f9abdd0
parent5e3d88cf03303c52956f258898def2cd6a294674 (diff)
parentc6c579740dacac33d23665af5be8dcde04208712 (diff)
downloadmarkdown-75f33d6da5a5c59151f7779634f7efe0fef4d746.tar.gz
markdown-75f33d6da5a5c59151f7779634f7efe0fef4d746.tar.bz2
markdown-75f33d6da5a5c59151f7779634f7efe0fef4d746.zip
Merge branch 'master' of git@gitorious.org:python-markdown/mainline
-rwxr-xr-xmarkdown.py2
-rw-r--r--setup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/markdown.py b/markdown.py
index f0bc0e8..40cfc61 100755
--- a/markdown.py
+++ b/markdown.py
@@ -28,7 +28,7 @@ License: [GPL 2](http://www.gnu.org/copyleft/gpl.html) or BSD
"""
version = "2.0-alpha"
-version_info = (2,0,0, "alpha")
+version_info = (2,0,0, "beta")
import re, sys, codecs, htmlentitydefs
from urlparse import urlparse, urlunparse
diff --git a/setup.py b/setup.py
index 424b7dd..290e2e0 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from distutils.core import setup
setup(
name = 'Markdown',
- version = '2.0-alpha',
+ version = '2.0-beta',
description = "Python implementation of Markdown.",
author = "Manfred Stienstra and Yuri takhteyev",
author_email = "yuri [at] freewisdom.org",