Merge branch 'release-0.1.3' into master
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 21 Aug 2015 05:19:51 +0000 (07:19 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 21 Aug 2015 05:19:51 +0000 (07:19 +0200)

Trivial merge