From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Tue, 15 Apr 2014 16:07:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin' into v0.8
X-Git-Tag: v0.8.0.6~1
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=ade8d80ab4e09cebf2ce38d039fa6a5a400c09cf

Merge remote-tracking branch 'origin' into v0.8
---

ade8d80ab4e09cebf2ce38d039fa6a5a400c09cf