tree 9ffde480b7c2d9d65fd1f2565c5a54e384f8dd3e
parent 27a49b5454a3257194f0c3bdc70d2d4e8dd6567f
parent 3985fe5e7372bf83c1cbb3259228700296c88899
author Sebastian Dröge <sebastian@centricular.com> 1403948626 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1403948626 +0200

Merge tag 'upstream/1.3.90'

Upstream version 1.3.90