tree abc6142d85d7cc7571a4880ccfe27219a1d4465b
parent 22dbd3106ab4458ca604ddf43b7b9ab40dbda76a
parent f70c810e3b4d3c9632099711c7fff2ce953c0645
author Sebastian Dröge <sebastian@centricular.com> 1471598543 +0300
committer Sebastian Dröge <sebastian@centricular.com> 1471598543 +0300

Merge tag 'upstream/1.8.3'

Upstream version 1.8.3