tree 4c894c21342c1f19d7fc6af10bafebda837d70b3
parent 37fa65d4f3b81c750b8b79b6ed37cb6b895aa71c
parent 63f38155df9cb281e4d48dbc14389e66446436f2
author Sebastian Dröge <slomo@circular-chaos.org> 1377858943 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1377858943 +0200

Merge tag 'upstream/1.1.4' into debian-experimental

Upstream version 1.1.4