Merge branch 'master' into ppa-daily-trunk

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 5edfef5..7ad776a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,8 @@
+psensor (1.0.2.x-1) saucy; urgency=low
+   * New upstream release.
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Tue, 3 Jun 2014 11:54:21 +0200
+
 psensor (1.0.2-1ppatrusty1) trusty; urgency=low
 
   * Bump trusty PPA