tree 0ffa543a5a249e0096d6cf4974678920e9334c8e
parent b98ed009983ab1f92dabe2f5dd4bce37e7b1ec89
parent 4a59b5b1ba1220e37b012e35e16f9ec874b943d8
author Sebastian Dröge <sebastian@centricular.com> 1446214413 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1446214413 +0200

Merge tag 'upstream/1.6.1'

Upstream version 1.6.1