Merge tag 'v0.4' into debian
authorAntonio Ospite <ao2@ao2.it>
Thu, 7 Jan 2016 16:36:24 +0000 (17:36 +0100)
committerAntonio Ospite <ao2@ao2.it>
Thu, 7 Jan 2016 16:36:24 +0000 (17:36 +0100)
Release v0.4


Trivial merge