Merge.

diff --cc ChangeLog
index 20c759025bb99888525aea603af3daf37bed08e0,a53c9b8df9baa702eb2a7313d4ddc64a82367df5..3e89810c9ef6f4757ef9536ff7521e1416104348
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,11 @@@
 +2013-10-20  Carl Hetherington  <cth@carlh.net>
 +
 +      * Allow specification of subtitle language even if DVD-o-matic
 +      isn't providing the subtitles.
++      
+ 2013-10-20  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.18 released.
  
  2013-10-19  Carl Hetherington  <cth@carlh.net>