Merge master.

diff --cc ChangeLog
index a402353d362c48f365291d38192d056369200838,942fc99a47df9f127959c5bea9e7054da91eb3ab..29576e47827ea259b9c6c2a2e783766b0f3af8a5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,11 @@@
  2014-06-09  Carl Hetherington  <cth@carlh.net>
  
 +      * Fix server/client with non-RGB24 sources.
 +
+       * Version 1.69.25 released.
+ 
+ 2014-06-09  Carl Hetherington  <cth@carlh.net>
+ 
        * Make audio gain a floating-point value in the UI (#367).
  
        * Work-around out-of-memory crashes with large start trims (#252).