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:07:30 +0000 (13:07 +0200)
commit5b3243c36ddbf48f6c01f9c1f6e36ebbce72498c
tree4433bbe34f953fb974a0687117bf75cab69179f4
parent4dbedff491bbf249247a10ae79689689ac890ad5
parent1120acd4c8973f97321863b2e0c6c7b6d6a14e89
Merge branch 'master' of ssh://wpitchoune.net/srv/git/psensor