From 1188ac4c5674275265a639d77ddebb496be9c63e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 18 Apr 2018 19:19:59 +0200
Subject: [PATCH 1/3] Add changelog from 0.6.4

This changelog was never added to the master branch, which I catch up on
with this commit.
---
 doc/src/09020-changelog.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/src/09020-changelog.md b/doc/src/09020-changelog.md
index be26b39d..b8cf52a0 100644
--- a/doc/src/09020-changelog.md
+++ b/doc/src/09020-changelog.md
@@ -123,6 +123,17 @@ This section contains the changelog from the last release to the next release.
       "--verbose" was passed, but the value of "--verbose" was not even checked.
 
 
+## 0.6.4
+
+Bugfix release for fixing:
+
+* `libimagrt` produced the editor command without taking arguments into
+  account.
+* `imag-init` creates `~/.imag` but not `~/.imag/store`.
+* Fix editor setup in `libimagrt` to use /dev/tty as stdin for editor, so
+  terminal-editors do not trash the terminal
+
+
 ## 0.6.3
 
 Bugfix release for fixing:

From 4667ec61b5eedffa7244529350637d6d8b884b12 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 18 Apr 2018 15:21:45 +0200
Subject: [PATCH 2/3] Move changelog to 0.7.0 section

---
 doc/src/09020-changelog.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/src/09020-changelog.md b/doc/src/09020-changelog.md
index b8cf52a0..ce024d31 100644
--- a/doc/src/09020-changelog.md
+++ b/doc/src/09020-changelog.md
@@ -18,6 +18,12 @@ Version 0.y.z and thus we can break the API like we want and need to.
 
 This section contains the changelog from the last release to the next release.
 
+* Major changes
+* Minor changes
+* Bugfixes
+
+## 0.7.0
+
 * Major changes
     * `imag-timetrack list --from/--to` now have `kairos` support - that means
       that complex `--from/--to` arguments (like `yesterday` or `today-2weeks`)

From 00affd2056a084e822128acb58a2964a3662014d Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 18 Apr 2018 16:49:33 +0200
Subject: [PATCH 3/3] Update date

---
 doc/src/00000.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/src/00000.md b/doc/src/00000.md
index a3b465ec..5b552fdc 100644
--- a/doc/src/00000.md
+++ b/doc/src/00000.md
@@ -1,7 +1,7 @@
 ---
 title: imag User Documentation
 version: 0.7.0
-date: February 2018
+date: April 2018
 listings: true
 codeBlockCaptions: true
 figureTitle: "Figure"