aboutsummaryrefslogtreecommitdiffstats
path: root/docs/AUTHORS
diff options
context:
space:
mode:
authorArtem Yunusov <nedrlab@gmail.com>2008-08-21 23:56:34 +0500
committerArtem Yunusov <nedrlab@gmail.com>2008-08-21 23:56:34 +0500
commit15fe229e19f218eb99dfb09cc745705a9c2d1e97 (patch)
tree827a01fa82a097774088a4196342bf5bd4ecd72d /docs/AUTHORS
parentb4362b3bf562bfb1b79bff9aee07feba32983e58 (diff)
parentc846dbced12091cfa1b783f268db96d8c87be030 (diff)
downloadmarkdown-15fe229e19f218eb99dfb09cc745705a9c2d1e97.tar.gz
markdown-15fe229e19f218eb99dfb09cc745705a9c2d1e97.tar.bz2
markdown-15fe229e19f218eb99dfb09cc745705a9c2d1e97.zip
Merge git@gitorious.org:python-markdown/mainline
Conflicts: markdown.py
Diffstat (limited to 'docs/AUTHORS')
-rw-r--r--docs/AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/AUTHORS b/docs/AUTHORS
index b4cd939..00abb15 100644
--- a/docs/AUTHORS
+++ b/docs/AUTHORS
@@ -32,5 +32,6 @@ Tiago Cogumbreiro
G. Clark Haynes
Daniel Krech
Steward Midwinter
+Neale Pickett
Malcolm Tredinnick
and many others to helped by reporting bugs