tree b71c7ee9d5d2285020b66860101407703d227b65
parent cc4b83a5ae7dbf6da4355f4e41a212dc42906b93
parent d0f923b679b74b32c1872d464911582870d3cee1
author Sebastian Dröge <sebastian@centricular.com> 1405781334 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1405781334 +0200

Merge tag 'upstream/1.4.0'

Upstream version 1.4.0