tree cb74bc2d862826fc634975abfc5a61d03896af0c
parent 45f9b51d3a452603c9ee932c3d56b60c131e8dba
parent 1a22664d46d5e842dbe97adbfb1595a90ceba1df
author Sebastian Dröge <sebastian@centricular.com> 1487856793 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1487856793 +0200

Merge tag 'upstream/1.10.4'

Upstream version 1.10.4