From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 2 Jun 2014 08:20:46 +0000 (+0200)
Subject: Merge branch 'master' into v1.0
X-Git-Tag: v1.0.1
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=ed43f9d461b8c7847a5e2a7d851f912561ba5f50

Merge branch 'master' into v1.0
---

ed43f9d461b8c7847a5e2a7d851f912561ba5f50