tree 7006b7ec8f0bf2bc6e8499c8708da5961a08e7c9
parent 3f20564664c98dbb7636b70f76ec590e5b9b31ce
parent 309a8e9914b3be0eb7bbd1e401d3c5946bd5944f
author Sebastian Dröge <sebastian@centricular.com> 1446216285 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1446216285 +0200

Merge tag 'upstream/1.6.1'

Upstream version 1.6.1