Merge branch 'release-0.10'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 30fd0e62b582e75a4b65d70bf5713beef31fb600,6a1af3f73c2502b338a019e2647f7b60849385f6..11853f2d392f8472ac953e7de27fcbf983a12971
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -5,11 -5,11 +5,10 @@@
  2014-09-11    Andrew Ruthven
        Spotted that if the next recording is in 30 hours, then it is
        displayed as "0 Days, 3". Correct it so it'll be displayed
-       as "30 Hours".
+       as "30 Hours". Also fixes an issue where "0 hours" was removed
+       if the hour was a multiple of 10. Thanks to Stephan Seitz for
+       reporting the multiple of 10 issue.
  
 -
  2013-10-28    Andrew Ruthven
          Guard against zero total disk space, this affected Werner Mahr.