tree 55edb286c6cf3154059c61460e9f78e6f22a72f6
parent 113939bd1f4fde6edb18693d643de5d133e0813f
parent 6a4a77fef52ab2cfeeee81abf9b3bf18cb4b9dea
author Sebastian Dröge <sebastian@centricular.com> 1450116312 +0100
committer Sebastian Dröge <sebastian@centricular.com> 1450116312 +0100

Merge tag 'upstream/1.6.2'

Upstream version 1.6.2