tree c8d4e930e3689d6dd145361de14289d5e1278829
parent a35cfab8efa8f112dd04367f10bb4b775ed27ad8
parent 0c490ce01d775119ea3b553ffee16c70c2391343
author Sebastian Dröge <sebastian@centricular.com> 1480426596 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1480426596 +0200

Merge tag 'upstream/1.10.2'

Upstream version 1.10.2