From: Christian Weiske <cweiske@cweiske.de>
Date: Tue, 18 Sep 2012 22:10:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'jnovack/markdown'
X-Git-Tag: v0.3.0~41
X-Git-Url: https://git.cweiske.de/phorkie.git/commitdiff_plain/027c801a4dc51db673bcbfcfbd396845f244e357

Merge remote-tracking branch 'jnovack/markdown'

Conflicts:
	ChangeLog
---

027c801a4dc51db673bcbfcfbd396845f244e357
diff --cc ChangeLog
index 4a9cfc5,8557be7..1dc1447
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
+ 2012-09-18  Justin J. Novack  <jnovack@gmail.com>
+ 
+ 	* Add Markdown as a known file-type.
+ 
 +2012-09-17  Justin J. Novack <jnovack@gmail.com>
 +
 +	* Add OpenID authentication
 +
  2012-09-16  Christian Weiske  <cweiske@cweiske.de>
  
  	* Implement request #12: DOAP documents for all pastes