Merge branch 'release-0.9.6'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Mon, 5 Jun 2017 22:31:15 +0000 (00:31 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Mon, 5 Jun 2017 22:31:15 +0000 (00:31 +0200)
* release-0.9.6:
  link_set: fix typo in f8d4e24


Trivial merge