Merge branch 'release-0.1.4' v0.1.4
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 10 Jun 2016 16:45:51 +0000 (18:45 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 10 Jun 2016 16:45:51 +0000 (18:45 +0200)

Trivial merge