Merge branch 'release-0.13' 0.13
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 31 May 2016 18:26:49 +0000 (20:26 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 31 May 2016 18:26:49 +0000 (20:26 +0200)

Trivial merge