tree c8d44c2ef8fa1f53f86a447b14715b5e51d4685d
parent 835aaa88419c6747ffb685bc0c3847630de8ce46
parent 31d65369dd2030fe38cd462108e07fb61daa0359
author Sebastian Dröge <sebastian@centricular.com> 1443214316 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1443214316 +0200

Merge tag 'upstream/1.6.0'

Upstream version 1.6.0