From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 1 Sep 2014 16:00:20 +0000 (+0200)
Subject: Merge branch 'master' into ppa-daily-trunk
X-Git-Tag: debian/1.1.3-1ppautopic1~7^2~3
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=06abeddc3fa8a3984c2300ab7223a350589d7c46;hp=06abeddc3fa8a3984c2300ab7223a350589d7c46

Merge branch 'master' into ppa-daily-trunk

Conflicts:
	debian/changelog
---