From: jporsini <jporsini@debian>
Date: Mon, 25 Aug 2014 08:11:37 +0000 (-0400)
Subject: Merge tag 'upstream/1.0.4'
X-Git-Tag: debian/1.0.4-1~7
X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=commitdiff_plain;h=ecd968930278d22ce234485d1bddced831c82f0f

Merge tag 'upstream/1.0.4'

Upstream version 1.0.4
---

ecd968930278d22ce234485d1bddced831c82f0f