From: Jean-Philippe Orsini Date: Tue, 15 Apr 2014 11:03:13 +0000 (+0200) Subject: Merge branch 'master' of ssh://wpitchoune.net/srv/git/psensor X-Git-Tag: v1.0.1~58^2 X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=9f2a0ab7eb32e053ca5165924f41286cdeb2d1ca Merge branch 'master' of ssh://wpitchoune.net/srv/git/psensor --- 9f2a0ab7eb32e053ca5165924f41286cdeb2d1ca