Merge branch 'release-0.12' 0.12
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 3 Feb 2015 17:58:50 +0000 (18:58 +0100)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 3 Feb 2015 17:58:50 +0000 (18:58 +0100)
commit668e00b821dce97504e8afed5038d4266ac67ce9
tree34effc9064a25845eea040f5f08a0b679e803184
parent7e470976ab9d4d7430e43ba96c9c100f799240ed
parent000c851e99698571a1512b9ca5da133ccc2b01c1
Merge branch 'release-0.12'