From 5e14f4fdb95e232b5ad60a031d0e9ee0a2f49cda Mon Sep 17 00:00:00 2001
From: Manuel Ebert <manuel@herelabs.com>
Date: Mon, 4 Mar 2013 15:50:18 -0800
Subject: [PATCH] Updated Readme from master

---
 CHANGELOG.md | 8 +++++---
 index.html   | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 825b382d..6675353f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,13 @@
 Changelog
 =========
 
-### 1.0.0-rc1
+### 1.0.0 (March 4, 2013)
 
-* [Fixed] A bug where jrnl would not go into compose mode
-* [Improved] Each journal can have individual settings
 * [New] Integrates seamlessly with DayOne
+* [Improved] Each journal can have individual settings
+* [Fixed] A bug where jrnl would not go into compose mode
+* [Fixed] A bug where jrnl would not add entries without timestamp
+* [Fixed] Support for parsedatetime 1.x
 
 ### 0.3.2 (July 5, 2012)
 
diff --git a/index.html b/index.html
index 8f62d5b2..978bdf7d 100644
--- a/index.html
+++ b/index.html
@@ -302,12 +302,14 @@ with open("my_journal.txt") as f:
 </ul>
 <h1>Changelog</h1>
 
-<h3>1.0.0-rc1</h3>
+<h3>1.0.0 (March 4, 2013)</h3>
 
 <ul>
-<li>[Fixed] A bug where jrnl would not go into compose mode</li>
-<li>[Improved] Each journal can have individual settings</li>
 <li>[New] Integrates seamlessly with DayOne</li>
+<li>[Improved] Each journal can have individual settings</li>
+<li>[Fixed] A bug where jrnl would not go into compose mode</li>
+<li>[Fixed] A bug where jrnl would not add entries without timestamp</li>
+<li>[Fixed] Support for parsedatetime 1.x</li>
 </ul>
 
 <h3>0.3.2 (July 5, 2012)</h3>