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: http://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=76ef076dad33bd2e8e325b88f504415002a97e4e;hp=76ef076dad33bd2e8e325b88f504415002a97e4e

Merge branch 'master' into ppa-daily-trunk

Conflicts:
	debian/changelog
---