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

Merge branch 'ppa-daily-trunk'

Conflicts:
	debian/psensor.install
---