tree df33804e02bfced2f962ec5c99d4747dcdc50ffa
parent f87322604ba7f75e1cd1d12a179b0ba3dbd5239b
parent 2fb4d5339d0be7fd735fddce100a1896f936f741
author Sebastian Dröge <sebastian@centricular.com> 1497948764 +0300
committer Sebastian Dröge <sebastian@centricular.com> 1497948764 +0300

Merge tag 'upstream/1.12.1'

Upstream version 1.12.1