Merge master.

1 files changed, 25 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c9ebcfb8b..fce782d7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* 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.
@@ -27,6 +32,26 @@
 
 	* 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.