Merge branch 'master' into ppa-daily-trunk
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 3 Jun 2014 10:21:23 +0000 (12:21 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 3 Jun 2014 10:21:23 +0000 (12:21 +0200)
Conflicts:
debian/changelog


No differences found