projects / psensor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea29c12 d3dff15)
Merge branch 'master' into v1.0 v1.0.1
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 2 Jun 2014 08:20:46 +0000 (10:20 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 2 Jun 2014 08:20:46 +0000 (10:20 +0200)

Trivial merge
psensor