From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sun, 9 Nov 2008 08:58:52 +0000 (+1300)
Subject: Merge branch 'release-0.9.0' into release-0.9
X-Git-Tag: 0.9.2~14
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=951d6fa2ba8379955c147036aff50111701b0918;p=mythtv-status.git

Merge branch 'release-0.9.0' into release-0.9

Conflicts:

	debian/changelog
---

951d6fa2ba8379955c147036aff50111701b0918
diff --cc debian/changelog
index f1ace6f,c805a6d..cb98dd2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +mythtv-status (0.9.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Andrew Ruthven <andrew@etc.gen.nz>  Thu, 30 Oct 2008 14:13:50 +1300
 +
+ mythtv-status (0.9.0-5) unstable; urgency=medium
+ 
+   * Update init.d with feedback from Adeodato Simó. 
+ 
+  -- Andrew Ruthven <andrew@etc.gen.nz>  Sat, 08 Nov 2008 10:49:01 +1300
+ 
  mythtv-status (0.9.0-4) unstable; urgency=medium
  
    * It turns out that release 0.9.1 of mythtv-status snuck into