From: Jean-Philippe Orsini <jeanfi@gmail.com>
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~59
X-Git-Url: http://git.wpitchoune.net/gitweb/?a=commitdiff_plain;h=5b3243c36ddbf48f6c01f9c1f6e36ebbce72498c;hp=4dbedff491bbf249247a10ae79689689ac890ad5;p=psensor.git

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