Merge.

diff --cc ChangeLog
index 34db26bcb4b73c325d9fd944c1183a2acf9ccc55,4af15e597e4b0837f8ce6bb0ec3d193bb0e80d6b..fd8dcded77ed19e41e682074f9cbd6b2640dba7b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,13 @@@
 +2013-12-23  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add TLS/SSL support to KDM email sending.
 +
+ 2013-12-23  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.47 released.
+ 
+ 2013-12-23  Carl Hetherington  <cth@carlh.net>
+ 
        * Add $START_TIME and $END_TIME as variables for the KDM email.
  
        * Add top/bottom option for 3D frames.