From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 3 Jun 2016 12:06:54 +0000 (+0200)
Subject: Merge tag 'upstream/1.1.4'
X-Git-Tag: debian/1.1.4-1ppaxenial1~1
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=d9faf40c40a26a23d26eac96ef7c28efec46e133

Merge tag 'upstream/1.1.4'

Upstream version 1.1.4
---

d9faf40c40a26a23d26eac96ef7c28efec46e133