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)
commitfd1bee3076ac3260933b9a795211fb247b023f69
tree6722c887fc7d0a591b4ef3a7b8adea454e7ec6ad
parentba72b36e5a27c35dfc5bd626e1f1a3ec0c5941cb
parent7a1f4de8f7e1ac3c1ed72d1539b4fb75c4aa8549
Merge branch 'release-0.9.6'

* release-0.9.6:
  link_set: fix typo in f8d4e24