tree accba11b14a8be1f21c75cc758f046d5f8f4baf7
parent f279fd7d9e78e94d8a8b8b78005f3a6e2cd8859d
parent 4285115316e06f1ae4d92e2d36122c428657fc4e
author Sebastian Dröge <sebastian@centricular.com> 1480426851 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1480426851 +0200

Merge tag 'upstream/1.10.2'

Upstream version 1.10.2