From a85c82137ec26124ebefccb4aeebb96a3cdb8a4c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 29 Apr 2015 22:53:52 +0100
Subject: Hand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master;
 config of encryption key.

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 5c3522869..c989f549f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-04-29  Carl Hetherington  <cth@carlh.net>
 
+	* Allow configuration of the encryption key (from master).
+
 	* Various fixes to bad timeline drag behaviour when
 	snapping (from master).
 
-- 
cgit v1.2.3