tree 6f742d2f9c94220798a65ed70d6c4ba244662714
parent 8c1d1c11ddc16a0094464783e3dbe00340fd0010
parent 6185266f7c4549932c0f62f574e2d8c2f3e26b5a
author Sebastian Dröge <sebastian@centricular.com> 1450118002 +0100
committer Sebastian Dröge <sebastian@centricular.com> 1450118002 +0100

Merge tag 'upstream/1.6.2'

Upstream version 1.6.2