From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Sun, 1 Jun 2014 08:21:41 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.0.2-1~13
X-Git-Url: http://git.wpitchoune.net/gitweb/?a=commitdiff_plain;h=ee0b7212d29624b6321a0eda9c7ba1e17817ba25;hp=-c;p=psensor-pkg-debian.git

Merge branch 'upstream'
---

ee0b7212d29624b6321a0eda9c7ba1e17817ba25