Merge master.

diff --cc ChangeLog
index 38a8ea5ce01a929593fb280a30e2e505f7f22552,729a335def35e801d57578088cff62afa732ec22..b7e9ad74fd3c52fb23dc3f46727e1d9c542b61d8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,11 +1,15 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
+ 2014-05-05  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.0 released.
+ 
+ 2014-05-02  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.68.0 released.
+ 
  2014-04-29  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.67.1 released.