Merge branch 'master' into ppa-daily-trunk
authorJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 25 Apr 2014 09:30:41 +0000 (11:30 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 25 Apr 2014 09:30:41 +0000 (11:30 +0200)
Conflicts:
debian/changelog


No differences found