Merge branch 'master' of ssh://wpitchoune.net/srv/git/psensor
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 11:03:13 +0000 (13:03 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 11:03:13 +0000 (13:03 +0200)

Trivial merge