tree 71037706b14cf1c4fd6e93cca68ec7439874b03c
parent 0c719bb4b9b436059b6dad29eedf71b20db7e822
parent f1995f11fc5659ae6e267ba3969a83d58df9a31f
author Sebastian Dröge <slomo@circular-chaos.org> 1375166227 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1375166227 +0200

Merge tag 'upstream/1.1.3' into debian-experimental

Upstream version 1.1.3