tree 8e9867fc3d29d8e04e97abb853c775b309cd51a9
parent 9ce8a8b0886380d05887f6c33f77482827533350
parent 9fd82e3eb2824c69201eb3ea1316408bd04734f5
author Sebastian Dröge <sebastian@centricular.com> 1450117765 +0100
committer Sebastian Dröge <sebastian@centricular.com> 1450117765 +0100

Merge tag 'upstream/1.6.2'

Upstream version 1.6.2