tree 56de3980a642c679fba768a5d3fb3deead4b47d9
parent 9000af3a54ff41f73b111a76aa5f8366f8e0211d
parent 2e22695f1eccf94af2d5647fb9c2a22a93b6c788
author Sebastian Dröge <sebastian@centricular.com> 1446215807 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1446215807 +0200

Merge tag 'upstream/1.6.1'

Upstream version 1.6.1