tree 2d5926a51cb02c1f9be66b544927efaf922684d9
parent e3f3868bc5b6d138274810abd6ce7204ca74fdef
parent 63f3a12981d4257915f0c1651ab409a08a1c66f8
author Sebastian Dröge <slomo@circular-chaos.org> 1379586705 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1379586705 +0200

Merge tag 'upstream/1.1.90' into debian-experimental

Upstream version 1.1.90