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

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

b334e64586b01449d33f2fa2ed727918d211457f