tree c820056e5288bebf1915b99c82cbdee08c19d8e6
parent 005fc8079324ba9230d336c0687b118f12434f31
parent 59ac66836ea32dece77690a65897083b77e92fdc
author Sebastian Dröge <sebastian@centricular.com> 1479386745 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1479386745 +0200

Merge tag 'upstream/1.10.1'

Upstream version 1.10.1