tree 91396ae3a11cd612270809d374cc0b770a79c7ce
parent 95534a3e58c1002ee81c427cccd227eac08944b8
parent 53c369599d438d5d6b631c038cd8676e4ccf0bb1
author Sebastian Dröge <sebastian@centricular.com> 1443214900 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1443214900 +0200

Merge tag 'upstream/1.6.0'

Upstream version 1.6.0