tree 116fd650a8292ff3ffa74f940b55ac54922bcf1d
parent 566239f436de153050cae2ddf33eea130b863c6f
parent 570fd49b3ca04e9689f1cfc43125ab541133e8f0
author Sebastian Dröge <sebastian@centricular.com> 1426529215 +0100
committer Sebastian Dröge <sebastian@centricular.com> 1426529398 +0100

Merge tag 'upstream/1.5.0.1+git20150316' into debian-experimental

Upstream version 1.5.0.1+git20150316