From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 25 Apr 2014 09:30:41 +0000 (+0200)
Subject: Merge branch 'master' into ppa-daily-trunk
X-Git-Tag: debian/1.1.3-1ppautopic1~7^2~9
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=56d21c57185d4e7c12a9afa191aa3336e73562c7;hp=56d21c57185d4e7c12a9afa191aa3336e73562c7

Merge branch 'master' into ppa-daily-trunk

Conflicts:
	debian/changelog
---