Merge branch 'master' of ssh://wpitchoune.net/srv/git/psensor-pkg-debian
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 07:30:39 +0000 (03:30 -0400)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 07:30:39 +0000 (03:30 -0400)

Trivial merge