Fix merge.

diff --cc ChangeLog
index 31134acf9cdbc528a9be327edbe9dfcd48726b50,1621d623c5d4d61191863dc27b8e17b7914675fd..1a86e5b00bb6dc258a6579b19488a442c7d37967
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,9 @@@
  2015-01-23  Carl Hetherington  <cth@carlh.net>
  
 +      * Fix flicker of SubRip subtitles in some cases.
 +
+       * Version 2.0.37 released.
+ 
  2015-01-21  Carl Hetherington  <cth@carlh.net>
  
        * Version 2.0.36 released.