tree 64f4df088e6b117fa305a21b314859541f7cc2ee
parent ff9f49ca18db6e4558417821956539a258e6cebc
parent 9a031092d5459534c9383ec51c84863f4863b266
author Sebastian Dröge <sebastian@centricular.com> 1405780028 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1405780028 +0200

Merge tag 'upstream/1.4.0'

Upstream version 1.4.0