From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Wed, 13 Aug 2014 18:14:03 +0000 (+0200)
Subject: Merge tag 'upstream/1.0.4'
X-Git-Tag: debian/1.0.4-1ppatrusty1~1
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=ecad10f9393a6a301dcaf1d5ec4d92563e281481

Merge tag 'upstream/1.0.4'

Upstream version 1.0.4
---

ecad10f9393a6a301dcaf1d5ec4d92563e281481