Merge remote-tracking branch 'morgotth/master'

vinta · vinta · commit eaeb9edfe752 · 2014-07-01T11:29:50.000+08:00
Conflicts:
	README.md

Fixed
diff --git a/README.md b/README.md
@@ -147,6 +147,7 @@ A curated list of awesome Python frameworks, libraries and resources. Inspired b
 * [Sphinx](http://sphinx-doc.org/) - Python Documentation generator.
 * [reStructuredText](http://docutils.sourceforge.net/rst.html) - Markup Syntax and Parser Component of Docutils.
 * [Python-Markdown](https://github.com/waylan/Python-Markdown) - A Python implementation of John Gruber’s Markdown.
+* [MkDocs](http://www.mkdocs.org/) - Markdown friendly documentation generator.
 
 ## Imagery
 
