tree ee5af39717918bc49fb2650e78bfa88f1b63cb6e
parent 2111f6c2a87dca64ec3d453ce07ae2814e106f07
parent 94fb72fd6f1484a8148b0ec76abd07347b32eb19
author Sebastian Dröge <sebastian@centricular.com> 1487856883 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1487856883 +0200

Merge tag 'upstream/1.10.4'

Upstream version 1.10.4