From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Tue, 15 Apr 2014 11:07:49 +0000 (+0200)
Subject: Merge branch 'master' of ssh://wpitchoune.net/srv/git/psensor
X-Git-Tag: v1.0.1~58
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=62260b9615b513816c44b4d05271258cdad8883d

Merge branch 'master' of ssh://wpitchoune.net/srv/git/psensor
---

62260b9615b513816c44b4d05271258cdad8883d