Merge debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 84f6620ff7b802539278f5f1ee9a7403b1cddf67..4cef9ede6d7867995de0b4170c78fb315020d99d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-lightdm (1.9.6-0ubuntu2) UNRELEASED; urgency=medium
+lightdm (1.9.6-0ubuntu2) trusty; urgency=medium
 
   * Clear default tty on lightdm shutdown, to avoid brief display of text
     messages on shutdown. (LP: #967229)
 
- -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 04 Feb 2014 09:38:31 +0000
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 04 Feb 2014 10:12:05 +0000
 
 lightdm (1.9.6-0ubuntu1) trusty; urgency=medium