Merge master.

diff --cc ChangeLog
index c9ebcfb8bd86b61260bbebc129f84eb04c973073,04762860200054e2bc0a9b493c828cc73777f771..fce782d7a9f6a54b70488b0b59f29950440b9ef4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,32 -1,28 +1,57 @@@
 +2014-10-05  Carl Hetherington  <cth@carlh.net>
 +
 +      * Use a more sensible default position and size for
 +      .srt subs.
 +
+ 2014-10-08  c.hetherington  <cth@carlh.net>
+ 
+       * Make server finding more reliable when
+       there are more than a few servers.
+ 
 +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.
+ 
+ 2014-10-08  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.74.1 released.
+ 
+ 2014-10-05  Carl Hetherington  <cth@carlh.net>
+ 
+       * Bump ffmpeg version.
+ 
+ 2014-10-06  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.74.0 released.
+ 
+ 2014-10-06  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.73.9 released.
+ 
  2014-09-28  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.73.8 released.

diff --cc cscript
Simple merge

diff --cc debian/changelog
Simple merge

diff --cc src/lib/server.cc
Simple merge

diff --cc src/lib/server_finder.cc
Simple merge

diff --cc src/lib/util.cc
Simple merge

diff --cc wscript
Simple merge