Merge branch 'master' into ppa-daily-trunk
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 1 Sep 2014 16:00:20 +0000 (18:00 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 1 Sep 2014 16:00:20 +0000 (18:00 +0200)
Conflicts:
debian/changelog


No differences found