From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 22 Sep 2014 20:34:07 +0000 (+0200)
Subject: Merge branch 'ppa-daily-trunk'
X-Git-Tag: debian/1.1.3-1ppautopic1~5
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=11742b0e179695f1cf4792188ae5e1003d8b0002;hp=11742b0e179695f1cf4792188ae5e1003d8b0002;ds=sidebyside

Merge branch 'ppa-daily-trunk'

Conflicts:
	debian/changelog
---