From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Fri, 10 Jun 2016 16:54:15 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.1.5^2~5
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=8ff88766d4f1605d486c87ab0e958874a78f580d;p=jFCPlib.git

Merge branch 'master' into next
---

8ff88766d4f1605d486c87ab0e958874a78f580d