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