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)
Conflicts:
debian/psensor.install


No differences found