From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Thu, 10 Apr 2014 06:46:26 +0000 (+0200)
Subject: Merge branch 'master' into v0.8
X-Git-Tag: v0.8.0.5~1
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=a8dd3fee101b033c301b2dc6e5bcb6dbac970ca5

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

a8dd3fee101b033c301b2dc6e5bcb6dbac970ca5