tree f56e9b0e18fb4298145d95fdeb2b13d131c8d2fb
parent d30e6a2b2c852783952e807e8eb362c91ac224ce
parent 061066560b946feede23ec7b26c769e3c36f6c2c
author Sebastian Dröge <sebastian@centricular.com> 1450117455 +0100
committer Sebastian Dröge <sebastian@centricular.com> 1450117455 +0100

Merge tag 'upstream/1.6.2'

Upstream version 1.6.2