Merge master.

diff --cc ChangeLog
index c2439f80742ebb65e023a5420aa96f5215b04518,cd348ca76db227dfbb238a3bfb75ccc2e18e6221..2782b563e9eaf5a9178f257c7871fb8a46265932
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
+ 2014-06-22  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix large memory leak with image sources.
+ 
  2014-06-21  Carl Hetherington  <cth@carlh.net>
  
        * Move email config into the KDM email page.

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