Hand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master; config of encryption key.

1 files changed, 2 insertions, 0 deletions

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).