tree 11d3d58b30f1be67900ec70d1951062f56bc3eab
parent eb23e4570c88b68ebcfbdf37498526aca5c48178
parent 14cfcf5621da6b257f77cfd10bf01c9b5570989c
author Sebastian Dröge <slomo@circular-chaos.org> 1379587284 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1379587284 +0200

Merge tag 'upstream/1.1.90' into debian-experimental

Upstream version 1.1.90