From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Sun, 26 Jun 2011 15:41:35 +0000 (+0000)
Subject: merged from trunk
X-Git-Url: https://git.wpitchoune.net/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fv0.6.2.9;p=psensor.git

merged from trunk
---

9cadb3e32f31b8a40fee76928bad7b06348803c4