tree ff5b13bb3168ab6928dec54ec54b1b12613a68c6
parent 583dc5666e8b18a105ae5b7079e36a63f0af0fda
parent 01f23673f675e49cdadf2007671a14835c7b2698
author Sebastian Dröge <slomo@circular-chaos.org> 1373792141 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1373792141 +0200

Merge tag 'upstream/1.1.2' into debian-experimental

Upstream version 1.1.2