tree 90f5f87f672f91d3eb3aee93fa50d31eafc6f08e
parent 4ac0cee1cf8ad2d7304e0ef42ef592ab008f7f70
parent 5f0bab00cdb35b85ff8dfd099c23d4f368a71abd
author Sebastian Dröge <slomo@circular-chaos.org> 1373794982 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1373794982 +0200

Merge tag 'upstream/1.1.2' into debian-experimental

Upstream version 1.1.2