Merge.

diff --cc ChangeLog
index 2d71fc9696bd7921eacb3b09e20db9043bb23f19,fee3c68762765c646ec0614ec7e0d160ad6e586b..19beeb5d9d667bef0905743cbfa08968cff46d16
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,11 +1,15 @@@
  2014-01-28  Carl Hetherington  <cth@carlh.net>
  
 +      * Use Mbit/s instead of the incorrect MBps.
 +
+       * Version 1.63.7 released.
+ 
+ 2014-01-28  Carl Hetherington  <cth@carlh.net>
+ 
        * Try to prevent Windows machines going to sleep during encodes.
  
 +      * Add option to not install main program / server on Windows.
 +
  2014-01-26  Carl Hetherington  <cth@carlh.net>
  
        * Change default JPEG2000 bandwith to 100MBps.