Merge branch 'maint'
authorAndre Noll <maan@tuebingen.mpg.de>
Sat, 23 Sep 2017 14:36:08 +0000 (16:36 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Sat, 23 Sep 2017 14:36:08 +0000 (16:36 +0200)
commite5de57de1b8bf1df96c152fc92f5a49f75d6d96c
tree0b35f06121b57c95b5711edf1cb05eb6aafc8a36
parent178fcf6a776ac60eaa55174c883f1c6735204670
parentbfa9eeeacd7822b8087fa42ce891a3a66b5b21e3
Merge branch 'maint'

* maint:
  paraslash 0.5.8

NEWS.md conflicted slightly, but this was easy resolve.
NEWS.md