From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 25 Apr 2014 09:30:41 +0000 (+0200)
Subject: Merge branch 'master' into ppa-daily-trunk
X-Git-Tag: debian/1.1.3-1ppautopic1~7^2~9
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=56d21c57185d4e7c12a9afa191aa3336e73562c7;hp=383095e38d0fa73b96430aac4e6b17b6627fe077

Merge branch 'master' into ppa-daily-trunk

Conflicts:
	debian/changelog
---

diff --git a/debian/changelog b/debian/changelog
index 00060b2..cdd4a25 100644
--- 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