From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 6 Jun 2016 14:37:31 +0000 (+0200)
Subject: Merge tag 'upstream/1.1.5'
X-Git-Tag: debian/1.1.5-1~2
X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=commitdiff_plain;h=cf12deca248d26a9577c634c9f37703c74f7358f

Merge tag 'upstream/1.1.5'

Upstream version 1.1.5
---

cf12deca248d26a9577c634c9f37703c74f7358f