From 0ba2e496f27e6ae9fb5ba161a0c4086892536ed0 Mon Sep 17 00:00:00 2001
From: Manuel Ebert <manuel.ebert@upf.edu>
Date: Mon, 21 May 2012 12:21:07 +0200
Subject: [PATCH] Updated Readme from master

---
 CHANGELOG.md | 5 +++++
 index.html   | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4c81da0..d8ae2a64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+### 0.2.4
+
+* Fixes parsing of new lines in journal files and entries
+* Adds support for encrypting and decrypting into new files
+
 ### 0.2.3
 
 * Adds a `-short` option that will only display the titles of entries (or, when filtering by tags, the context of the tag)
diff --git a/index.html b/index.html
index e326648d..f4faca4b 100644
--- a/index.html
+++ b/index.html
@@ -263,6 +263,13 @@ with open("my_journal.txt") as f:
 </code></pre>
 <h1>Changelog</h1>
 
+<h3>0.2.4</h3>
+
+<ul>
+<li>Fixes parsing of new lines in journal files and entries</li>
+<li>Adds support for encrypting and decrypting into new files</li>
+</ul>
+
 <h3>0.2.3</h3>
 
 <ul>