tree 316218bf41a14398aab555640ca45427800a8673
parent a476fe1e669debac112af169cef7aba0649c52cf
parent 917cda83bc79f2816e224a9f60f385f31a20e04d
author Sebastian Dröge <slomo@circular-chaos.org> 1375165543 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1375165543 +0200

Merge tag 'upstream/1.1.3' into debian-experimental

Upstream version 1.1.3