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

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

1e962866189e8ec75390500ea41d02baba48aa2d