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)
commit76ef076dad33bd2e8e325b88f504415002a97e4e
tree0c64c9b05e78d596e898081f8a24fb99232399ef
parenta9b859bc5808ff4ed218b0f3a78e69b5bcff4b76
parent6ed68186cdcb55f05d5e98084d9f273791188faa
Merge branch 'master' into ppa-daily-trunk

Conflicts:
debian/changelog
debian/changelog