Merge master.

diff --cc ChangeLog
index fce782d7a9f6a54b70488b0b59f29950440b9ef4,82ee2675e5288050400adcd05e3ba41c3e91c2d0..0d2b89a59f4a49813c5a23974035afc780535f93
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -8,30 -7,6 +7,35 @@@
        * Make server finding more reliable when
        there are more than a few servers.
  
++2014-10-05  Carl Hetherington  <cth@carlh.net>
++
++      * Use a more sensible default position and size for
++      .srt subs.
++
 +2014-10-03  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.14 released.
 +
 +2014-10-01  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.13 released.
 +
 +2014-09-30  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.12 released.
 +
 +2014-09-30  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add basic video fade in/out.
 +
 +2014-09-22  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.11 released.
 +
 +2014-09-18  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.10 released.
 +
  2014-10-08  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.74.2 released.

diff --cc debian/changelog
Simple merge

diff --cc src/wx/wx_util.cc
Simple merge