Merge branch 'master' into ppa-daily-trunk

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 00060b2..cdd4a25 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+psensor (0.8.0.x-1) saucy; urgency=low
+
+  * New upstream release.
+
+-- Jean-Philippe Orsini <jeanfi@gmail.com>  Mon, 07 Apr 2014 08:41:44 +0200
+
 psensor (0.8.0.6-1ppatrusty1) trusty; urgency=low
 
   * Bump trusty PPA