Merge ChangeLog.

diff --cc ChangeLog
index 076a7ebfe23857c5dea777648e2b284bafcba9c3,b68ba79109de084e40d20151023908dbbef095d1..8e75c88e25853a9142d2f774b6e37694c5efdb1b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
+ 2012-11-10  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.57 released.
+ 
 +2012-11-10  Carl Hetherington  <cth@carlh.net>
 +
 +      * Fix crash when trying to use a DCI name when there
 +      is no soundtrack (yet) (reported by Wolfgang Woehl).
 +
  2012-11-07  Carl Hetherington  <cth@carlh.net>
  
        * Version 0.56 released.