From e059120ccac1b463e250a75252394d03efef6210 Mon Sep 17 00:00:00 2001
From: Marc Wouts <marc.wouts@gmail.com>
Date: Wed, 11 Jul 2018 01:02:21 +0200
Subject: [PATCH] New version 0.2.5

---
 HISTORY.rst | 15 ++++++++++++++-
 setup.py    |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 238a3f0dd..bc99020bd 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -6,6 +6,19 @@ Release History
 dev
 +++
 
+0.2.5 (2018-07-11)
++++++++++++++++++++
+
+**Improvements**
+
+- Outputs of existing `.ipynb` versions are combined with matching inputs
+ of R markdown version, as suggested by @grst (#12)
+
+**BugFixes**
+
+- Support for unicode text in python 2.7 (#11)
+
+
 0.2.4 (2018-07-05)
 +++++++++++++++++++
 
@@ -18,7 +31,7 @@ solved in Jupyter directly.
 **BugFixes**
 
 - dependencies included in `setup.py`
-- pre_save_hook work with non-empty `notebook_dir` https://github.com/mwouts/nbrmd/issues/9
+- pre_save_hook work with non-empty `notebook_dir` (#9)
 
 0.2.3 (2018-06-28)
 +++++++++++++++++++
diff --git a/setup.py b/setup.py
index 65adab139..06c5e00e1 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='nbrmd',
-    version='0.2.4',
+    version='0.2.5',
     author='Marc Wouts',
     author_email='marc.wouts@gmail.com',
     description='Jupyter from/to R markdown notebooks',