From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Mon, 8 Dec 2008 08:37:31 +0000 (+1300)
Subject: Merge branch 'release-0.9.0' into release-0.9
X-Git-Tag: 0.9.2~12
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1a913b204affd1602134661b60047a66f3d9622;p=mythtv-status.git

Merge branch 'release-0.9.0' into release-0.9

Conflicts:

	debian/changelog
---

b1a913b204affd1602134661b60047a66f3d9622
diff --cc debian/changelog
index cb98dd2,3497ec1..ba9b413
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +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-6) unstable; urgency=low
+ 
+   * Swedish debconf translation from Martin Bagge (Closes: #506599).
+   * Add a status to the init.d file.
+ 
+  -- Andrew Ruthven <andrew@etc.gen.nz>  Sun, 23 Nov 2008 13:29:52 +1300
+ 
  mythtv-status (0.9.0-5) unstable; urgency=medium
  
    * Update init.d with feedback from Adeodato Simó.