Merge branch 'ppa-daily-trunk'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 20 Sep 2014 22:38:22 +0000 (00:38 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 20 Sep 2014 22:38:22 +0000 (00:38 +0200)
commit75fa49ffb0c9c8b60328c13ec8613299d094a2e5
tree37cc6f99268846d64d1c7b38f892b2e270f3f81b
parent533a89c602209a839abc197e95f3a1436a2639b2
parentec7a85d4eb0c17242f774268109ca5a1cc38a657
Merge branch 'ppa-daily-trunk'

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