From ac42f93bf9c57956b557e080bb43b937077c1115 Mon Sep 17 00:00:00 2001
From: Manuel Ebert <manuel.ebert@upf.edu>
Date: Tue, 17 Apr 2012 21:58:42 +0200
Subject: [PATCH] Updated Readme from master

---
 CHANGELOG.md | 1 +
 index.html   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4b5c160..2233df16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 ### 0.2.2
 
 * Adds --encrypt and --decrypt to encrypt / descrypt existing journal files
+* Adds markdown export (kudos to dedan)
 
 ### 0.2.1
 
diff --git a/index.html b/index.html
index 805b7a03..c59e1065 100644
--- a/index.html
+++ b/index.html
@@ -251,6 +251,7 @@ with open("my_journal.txt") as f:
 
 <ul>
 <li>Adds --encrypt and --decrypt to encrypt / descrypt existing journal files</li>
+<li>Adds markdown export (kudos to dedan)</li>
 </ul>
 
 <h3>0.2.1</h3>