From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Wed, 9 Apr 2014 23:59:44 +0000 (+0200)
Subject: Merge branch 'master' into v0.8
X-Git-Tag: v0.8.0.5~4
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=4e2f971f215b22026bbc390f552a15700934cb6f

Merge branch 'master' into v0.8
---

4e2f971f215b22026bbc390f552a15700934cb6f