tree 1f75654947a31fedd5169e132a3393f68facc6d8
parent 4935bca0f8d4914da0e3a8b0c6a9e6a69429bd12
parent 3330fc24cc2a1d4bce05cef6324723a9d9d127b8
author Sebastian Dröge <slomo@circular-chaos.org> 1373792748 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1373792748 +0200

Merge tag 'upstream/1.1.2' into debian-experimental

Upstream version 1.1.2