From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Tue, 3 Feb 2015 17:58:50 +0000 (+0100)
Subject: Merge branch 'release-0.12'
X-Git-Tag: 0.12^0
X-Git-Url: https://git.pterodactylus.net/?p=jSite.git;a=commitdiff_plain;h=668e00b821dce97504e8afed5038d4266ac67ce9;hp=000c851e99698571a1512b9ca5da133ccc2b01c1

Merge branch 'release-0.12'
---