From cb55bccb176c4efbfa54cce1d21f9c5b765ae406 Mon Sep 17 00:00:00 2001
From: Manuel Ebert <manuel@1450.me>
Date: Tue, 6 Aug 2013 17:57:36 -0700
Subject: [PATCH] Version bump

---
 CHANGELOG.md     | 8 ++++++--
 jrnl/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c3c430c..ca77eb20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,11 @@
 Changelog
 =========
 
-### 1.4.2
+### 1.5.0
+
+* [Improved] Exporting, encrypting and displaying tags now takes your filter options into account. So you could export everything before May 2012: `jrnl -to 'may 2012' --export json`. Or encrypt all entries tagged with `@work` into a new journal: `jrnl @work --encrypt work_journal.txt`. Or display all tags of posts where Bob is also tagged: `jrnl @bob --tags`
+
+#### 1.4.2
 
 * [Fixed] Tagging works again
 * Meta-info for PyPi updated
@@ -10,7 +14,7 @@ Changelog
 
 * [Improved] Unifies encryption between Python 2 and 3. If you have problems reading encrypted journals afterwards, first decrypt your journal with the __old__ jrnl version (install with `pip install jrnl==1.3.1`, then `jrnl --decrypt`), upgrade jrnl (`pip install jrnl --upgrade`) and encrypt it again (`jrnl --encrypt`).
 
-### 1.3.2
+#### 1.3.2
 
 * [Improved] Everything that is not direct output of jrnl will be written stderr to improve integration
 
diff --git a/jrnl/__init__.py b/jrnl/__init__.py
index 64f3178f..6c783c61 100644
--- a/jrnl/__init__.py
+++ b/jrnl/__init__.py
@@ -7,7 +7,7 @@ jrnl is a simple journal application for your command line.
 """
 
 __title__ = 'jrnl'
-__version__ = '1.4.2'
+__version__ = '1.5.0'
 __author__ = 'Manuel Ebert'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright 2013 Manuel Ebert'