Merge branch 'ppa-daily-trunk'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 20:34:07 +0000 (22:34 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 20:34:07 +0000 (22:34 +0200)
commit11742b0e179695f1cf4792188ae5e1003d8b0002
tree6594a9e3a4d03c90771965dd8cfd8b0a93033459
parent9aa9c8d3823d79755ddd1aa49b9af6198e24d4e2
parent7f7ed1ed364d68645c64045d0fa92e1c33d456ec
Merge branch 'ppa-daily-trunk'

Conflicts:
debian/changelog
debian/changelog
debian/psensor.install