From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Thu, 4 Dec 2014 21:06:15 +0000 (+1300)
Subject: Merge branch 'release-0.10'
X-Git-Tag: 1.0.0~72
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56645e8fb7192c725d96287bd0c61e19af0460ab;p=mythtv-status.git

Merge branch 'release-0.10'

Conflicts:
	ChangeLog
---

56645e8fb7192c725d96287bd0c61e19af0460ab
diff --cc ChangeLog
index 30fd0e6,6a1af3f..11853f2
--- a/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.