Merge.

diff --cc ChangeLog
index 44d8d512d84a943963875c19ada75d0fda3235b8,e6702bc8babdd119c9a8fba4924c2a34d5d98523..30179a5eae9191fc1e2510353af25ff4b874f2dd
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
  2013-03-25  Carl Hetherington  <cth@carlh.net>
  
 +      * Add option to set user interface language.
 +
++2013-03-25  Carl Hetherington  <cth@carlh.net>
++      
+       * Version 0.78beta6 released.
+ 
  2013-03-24  Carl Hetherington  <cth@carlh.net>
  
        * Add UI option to select interface language.