From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Tue, 3 Jun 2014 10:21:23 +0000 (+0200)
Subject: Merge branch 'master' into ppa-daily-trunk
X-Git-Tag: debian/1.1.3-1ppautopic1~7^2~6
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=76ef076dad33bd2e8e325b88f504415002a97e4e;hp=6ed68186cdcb55f05d5e98084d9f273791188faa

Merge branch 'master' into ppa-daily-trunk

Conflicts:
	debian/changelog
---

diff --git a/debian/changelog b/debian/changelog
index 5edfef5..7ad776a 100644
--- 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