From 5c4fecb87bbd60dfba1c5563de744cea6de77efb Mon Sep 17 00:00:00 2001
From: Elisabeth Henry <liz.henry@ouvaton.org>
Date: Tue, 20 Sep 2016 16:19:00 +0200
Subject: [PATCH] Update ChangeLog

---
 ChangeLog.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 953604b..ed259b7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -22,6 +22,11 @@ unreleased
   * LaTeX:
     * If `tex.short` is set to `true`, chapters will be displayed as
       `\sections` since `article` class doesn't handle chapters.
+* Bugfixes:
+  * `import_config` only import options from another book file that
+    are not equal to the default ones and that haven't already been
+    set by the caller. E.g., `author: foo` then `import_config:
+    bar.book` won't erase the author previously set.
 * Crowbook program:
   * Still working to improve error messages.
 * Internal/API: