tree e1544a7eebd520ca16d2c4ff0de131cb7501f357
parent b249a84443714a0488cfb889c6a0de474cead4f3
parent 3030ab56ad88c1d029be9fd868fbcb416abfb6f6
author Sebastian Dröge <sebastian@centricular.com> 1446216963 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1446216963 +0200

Merge tag 'upstream/1.6.1'

Upstream version 1.6.1