Merge.

diff --cc ChangeLog
index 21b6eec1585cb5fd1fd7877111e68bd6b0a83f00,729a335def35e801d57578088cff62afa732ec22..440434d5ea3c19509c3d205cca429eb6dc4c56da
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
 +2014-05-09  Carl Hetherington  <cth@carlh.net>
 +
 +      * Fix crash on using content with more than 12 audio channels.
 +
 +      * Re-introduce ffprobe call when adding content.
 +
+ 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.