tree f437528c37307828be9739e1f87a39a452405038
parent 8ab4b4611a6c8639347d928b97b49a609621bc8d
parent e929e8885a396f88b87e10a870f5e712d91a6d2b
author Sebastian Dröge <sebastian@centricular.com> 1479387340 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1479387340 +0200

Merge tag 'upstream/1.10.1'

Upstream version 1.10.1